添加资源

2026-06-12 12:05:30 +08:00
parent f7eb2d4368
commit c7dd125bc0
15 changed files with 846 additions and 20 deletions
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -0,0 +1,6 @@
+{
+  "enabledPlugins": {
+    "superpowers@claude-plugins-official": true,
+    "ralph-loop@claude-plugins-official": true
+  }
+}
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,11 +1,16 @@
 {
  "permissions": {
-    "dangerouslySkipPermissions": true,
    "allow": [
      "Read(*)",
      "Write(*)",
      "Bash(*)",
-      "mcp__unity-mcp__*"
-    ]
+      "mcp__unity-mcp__*",
+      "PowerShell(Select-String -Path \"E:\\\\Works\\\\Unity\\\\Projects\\\\zeling_v2\\\\Assets\\\\_Game\\\\Prefabs\\\\Player\\\\Player.prefab\" -Pattern \"7ca41f67644b6b843ba7ef65e78b13e5\" -Context 2,8 | ForEach-Object { $_.Context.PreContext + $_.Line + $_.Context.PostContext })",
+      "PowerShell(foreach \\($f in @\\(\"Combat\\\\EVT_CheckpointRespawn\",\"Core\\\\EVT_FadeOutRequest\",\"Core\\\\EVT_FadeInRequest\"\\)\\) { $g = \\(Get-Content \"E:\\\\Works\\\\Unity\\\\Projects\\\\zeling_v2\\\\Assets\\\\_Game\\\\Data\\\\Events\\\\$f.asset.meta\" | Select-String 'guid: \\(\\\\w+\\)'\\).Matches[0].Groups[1].Value; \"$f -> $g\" })",
+      "PowerShell(Select-String *)",
+      "PowerShell(rtk git *)",
+      "PowerShell(Select-String -Path \"E:\\\\Works\\\\Unity\\\\Projects\\\\zeling_v2\\\\Assets\\\\_Game\\\\Prefabs\\\\Weapons\\\\WPN_WPN_DiHun_HitBox.prefab\" -Pattern \"adb4af2f574f356449634bc130f94592\" -Context 0,7 | ForEach-Object { $_.Line; $_.Context.PostContext })"
+    ],
+    "dangerouslySkipPermissions": true
  }
 }
--- a/.claude/skills/planning-with-files
+++ b/.claude/skills/planning-with-files
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air1.asset
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air1.asset
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 96b10c11e6173394a8fa8d9c614b0035, type: 3}
+  m_Name: CMB_Player_ATK_Air1
+  m_EditorClassIdentifier: 
+  sourceId: 
+  skillId: 
+  BaseDamage: 10
+  DamageMultiplier: 1
+  Type: 0
+  Category: 0
+  Flags: 2
+  Tags: 1
+  KnockbackForce: 5
+  HitStunDuration: 0.1
+  BreakLevel: 1
+  FxType: 1
+  ComboWindowDuration: 0.4
+  CancelWindowEnd: 0.5
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air1.asset.meta
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 88812fa8d3e028a41b8a20f2ca90c9fa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air2.asset
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air2.asset
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 96b10c11e6173394a8fa8d9c614b0035, type: 3}
+  m_Name: CMB_Player_ATK_Air2
+  m_EditorClassIdentifier: 
+  sourceId: 
+  skillId: 
+  BaseDamage: 10
+  DamageMultiplier: 1
+  Type: 0
+  Category: 0
+  Flags: 2
+  Tags: 1
+  KnockbackForce: 5
+  HitStunDuration: 0.1
+  BreakLevel: 1
+  FxType: 1
+  ComboWindowDuration: 0.4
+  CancelWindowEnd: 0.5
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air2.asset.meta
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Air2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 967b72666e8bb2f498e4f7a03719e7c9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Down.asset
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Down.asset
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 96b10c11e6173394a8fa8d9c614b0035, type: 3}
+  m_Name: CMB_Player_ATK_Down
+  m_EditorClassIdentifier: 
+  sourceId: 
+  skillId: 
+  BaseDamage: 10
+  DamageMultiplier: 1
+  Type: 0
+  Category: 0
+  Flags: 2
+  Tags: 1
+  KnockbackForce: 5
+  HitStunDuration: 0.1
+  BreakLevel: 1
+  FxType: 1
+  ComboWindowDuration: 0.4
+  CancelWindowEnd: 0.5
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Down.asset.meta
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Down.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c81ccb5ed489a444b02709ec4506c5e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Up.asset
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Up.asset
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 96b10c11e6173394a8fa8d9c614b0035, type: 3}
+  m_Name: CMB_Player_ATK_Up
+  m_EditorClassIdentifier: 
+  sourceId: 
+  skillId: 
+  BaseDamage: 10
+  DamageMultiplier: 1
+  Type: 0
+  Category: 0
+  Flags: 2
+  Tags: 1
+  KnockbackForce: 5
+  HitStunDuration: 0.1
+  BreakLevel: 1
+  FxType: 1
+  ComboWindowDuration: 0.4
+  CancelWindowEnd: 0.5
--- a/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Up.asset.meta
+++ b/Assets/_Game/Data/Combat/DamageSources/CMB_Player_ATK_Up.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ef2a60dea66f7e44c8659264b94a9c38
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset
+++ b/Assets/_Game/Data/Combat/Weapons/WPN_DiHun.asset
@@ -63,7 +63,7 @@ MonoBehaviour:
        _Names: []
      _Clip: {fileID: 7400000, guid: bde6a54ec8fc04f45a424f9bcd7845df, type: 2}
      _NormalizedStartTime: NaN
-    damageSource: {fileID: 0}
+    damageSource: {fileID: 11400000, guid: 88812fa8d3e028a41b8a20f2ca90c9fa, type: 2}
    hitBoxEnter: 0.1
    hitBoxExit: 0.8
    comboInputOpen: 0
@@ -81,7 +81,7 @@ MonoBehaviour:
        _Names: []
      _Clip: {fileID: 7400000, guid: c0ef319f521c2a2448022cebcf9c9266, type: 2}
      _NormalizedStartTime: NaN
-    damageSource: {fileID: 0}
+    damageSource: {fileID: 11400000, guid: 967b72666e8bb2f498e4f7a03719e7c9, type: 2}
    hitBoxEnter: 0.1
    hitBoxExit: 0.8
    comboInputOpen: 0.026
@@ -100,7 +100,7 @@ MonoBehaviour:
        _Names: []
      _Clip: {fileID: 7400000, guid: baae11fb27958444d911f8d637448184, type: 2}
      _NormalizedStartTime: NaN
-    damageSource: {fileID: 0}
+    damageSource: {fileID: 11400000, guid: ef2a60dea66f7e44c8659264b94a9c38, type: 2}
    hitBoxEnter: 0.2
    hitBoxExit: 0.7
    comboInputOpen: 0
@@ -119,7 +119,7 @@ MonoBehaviour:
        _Names: []
      _Clip: {fileID: 7400000, guid: d199f06821d6b92478f9fd7c3f0cd11d, type: 2}
      _NormalizedStartTime: NaN
-    damageSource: {fileID: 0}
+    damageSource: {fileID: 11400000, guid: 6c81ccb5ed489a444b02709ec4506c5e, type: 2}
    hitBoxEnter: 0.1
    hitBoxExit: 0.9
    comboInputOpen: 0
--- 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: 4194295
+  InitialAbilities: 4194167
--- a/Assets/_Game/Prefabs/Weapons/WPN_WPN_DiHun_HitBox.prefab
+++ b/Assets/_Game/Prefabs/Weapons/WPN_WPN_DiHun_HitBox.prefab
@@ -27,7 +27,7 @@ Transform:
  m_GameObject: {fileID: 1932889250901504761}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: -1.099, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -65,7 +65,7 @@ BoxCollider2D:
  m_IsTrigger: 1
  m_UsedByEffector: 0
  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0.15452856, y: -0.38786495}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0, y: 0}
@@ -76,7 +76,7 @@ BoxCollider2D:
    adaptiveTiling: 0
  m_AutoTiling: 0
  serializedVersion: 2
-  m_Size: {x: 1, y: 0.5}
+  m_Size: {x: 1.6900157, y: 1.2757299}
  m_EdgeRadius: 0
 --- !u!114 &6478051166999031478
 MonoBehaviour:
@@ -92,6 +92,11 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _defaultSource: {fileID: 0}
  _hitCooldown: 0.1
+  _hitMode: 0
+  _hitInterval: 0.5
+  _targetLayers:
+    serializedVersion: 2
+    m_Bits: 134217728
  _id: 
  _rivalHitBoxMask:
    serializedVersion: 2
@@ -161,7 +166,7 @@ BoxCollider2D:
  m_IsTrigger: 1
  m_UsedByEffector: 0
  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0.84977627, y: -0.11744261}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0, y: 0}
@@ -172,7 +177,7 @@ BoxCollider2D:
    adaptiveTiling: 0
  m_AutoTiling: 0
  serializedVersion: 2
-  m_Size: {x: 1, y: 0.5}
+  m_Size: {x: 1.1095867, y: 1.4387312}
  m_EdgeRadius: 0
 --- !u!114 &4757677899241504248
 MonoBehaviour:
@@ -188,6 +193,11 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _defaultSource: {fileID: 0}
  _hitCooldown: 0.1
+  _hitMode: 0
+  _hitInterval: 0.5
+  _targetLayers:
+    serializedVersion: 2
+    m_Bits: 134217728
  _id: 
  _rivalHitBoxMask:
    serializedVersion: 2
@@ -219,7 +229,7 @@ Transform:
  m_GameObject: {fileID: 4335406389674002762}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 1.349, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -257,7 +267,7 @@ BoxCollider2D:
  m_IsTrigger: 1
  m_UsedByEffector: 0
  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0.1258812, y: -0.178514}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0, y: 0}
@@ -268,7 +278,7 @@ BoxCollider2D:
    adaptiveTiling: 0
  m_AutoTiling: 0
  serializedVersion: 2
-  m_Size: {x: 0.5, y: 1}
+  m_Size: {x: 1.5816574, y: 0.7235365}
  m_EdgeRadius: 0
 --- !u!114 &1392799324577637263
 MonoBehaviour:
@@ -284,6 +294,11 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _defaultSource: {fileID: 0}
  _hitCooldown: 0.1
+  _hitMode: 0
+  _hitInterval: 0.5
+  _targetLayers:
+    serializedVersion: 2
+    m_Bits: 134217728
  _id: 
  _rivalHitBoxMask:
    serializedVersion: 2
@@ -298,6 +313,7 @@ GameObject:
  m_Component:
  - component: {fileID: 8975424752584779179}
  - component: {fileID: 3691925044832415471}
+  - component: {fileID: 7280738434496013396}
  m_Layer: 0
  m_Name: WPN_WPN_DiHun_HitBox
  m_TagString: Untagged
@@ -340,6 +356,24 @@ MonoBehaviour:
  _hitBoxUp: {fileID: 1392799324577637263}
  _hitBoxDown: {fileID: 6478051166999031478}
  _hitBoxAir: {fileID: 1382006829078153708}
+--- !u!114 &7280738434496013396
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4821376343125962025}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb4af2f574f356449634bc130f94592, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _onHitLight: {fileID: 0}
+  _onHitMedium: {fileID: 0}
+  _onHitHeavy: {fileID: 0}
+  _hitPositionMode: 1
+  _onAttackWhoosh: {fileID: 0}
+  _namedPresets: []
 --- !u!1 &6434981771063321190
 GameObject:
  m_ObjectHideFlags: 0
@@ -405,7 +439,7 @@ BoxCollider2D:
  m_IsTrigger: 1
  m_UsedByEffector: 0
  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0.84977627, y: -0.11744261}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0, y: 0}
@@ -416,7 +450,7 @@ BoxCollider2D:
    adaptiveTiling: 0
  m_AutoTiling: 0
  serializedVersion: 2
-  m_Size: {x: 0.5, y: 1}
+  m_Size: {x: 1.1095867, y: 1.4387312}
  m_EdgeRadius: 0
 --- !u!114 &1382006829078153708
 MonoBehaviour:
@@ -432,6 +466,11 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _defaultSource: {fileID: 0}
  _hitCooldown: 0.1
+  _hitMode: 0
+  _hitInterval: 0.5
+  _targetLayers:
+    serializedVersion: 2
+    m_Bits: 134217728
  _id: 
  _rivalHitBoxMask:
    serializedVersion: 2
--- a/Assets/_Game/Scenes/Testings/TestRoomA.unity
+++ b/Assets/_Game/Scenes/Testings/TestRoomA.unity
@@ -9203,6 +9203,37 @@ BoxCollider2D:
  serializedVersion: 2
  m_Size: {x: 0.1, y: 4}
  m_EdgeRadius: 0
+--- !u!1 &505494683
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 505494684}
+  m_Layer: 0
+  m_Name: RespawnPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &505494684
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505494683}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.7, y: -0.48, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2146472069}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &510769166
 GameObject:
  m_ObjectHideFlags: 0
@@ -15949,6 +15980,102 @@ Transform:
  m_Children: []
  m_Father: {fileID: 1328380148}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &960547552
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 960547555}
+  - component: {fileID: 960547554}
+  - component: {fileID: 960547553}
+  m_Layer: 24
+  m_Name: CheckpointMarker_2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &960547553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960547552}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81b8a6464ad9a90459fa28f2a0e1ce02, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _playerLayers:
+    serializedVersion: 2
+    m_Bits: 512
+  _respawnPoint: {fileID: 1476535863}
+  _onCheckpointReached: {fileID: 11400000, guid: 172e9bc777b1b4b4b99f47e43cbaedb1, type: 2}
+--- !u!61 &960547554
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960547552}
+  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, y: 0}
+  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, y: 2}
+  m_EdgeRadius: 0
+--- !u!4 &960547555
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960547552}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -34.06, y: 2.2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1476535863}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &985676459
 GameObject:
  m_ObjectHideFlags: 0
@@ -22824,6 +22951,157 @@ PolygonCollider2D:
      - {x: -13, y: 14}
      - {x: -13, y: -17}
  m_UseDelaunayMesh: 0
+--- !u!1 &1288627275
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1288627279}
+  - component: {fileID: 1288627278}
+  - component: {fileID: 1288627277}
+  - component: {fileID: 1288627276}
+  m_Layer: 25
+  m_Name: LethalTrap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1288627276
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288627275}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03c34fc042c310942a02cfa075dcd981, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _damage: 1
+  _playerLayers:
+    serializedVersion: 2
+    m_Bits: 32768
+  _onPlayerDied: {fileID: 11400000, guid: 7e1624bde83886d40b32f43e84a65a75, type: 2}
+  _onCheckpointRespawn: {fileID: 11400000, guid: eef5aef659932dd448be6d91119082e6, type: 2}
+  _canPogo: 1
+--- !u!212 &1288627277
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288627275}
+  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: 6c1a7b756ba1d4646a405f7f6e0833ad, 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 &1288627278
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288627275}
+  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, 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: 2, y: 0.5}
+  m_EdgeRadius: 0
+--- !u!4 &1288627279
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288627275}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -30.57, y: 1.49, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2040911888}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1295644709
 GameObject:
  m_ObjectHideFlags: 0
@@ -25323,10 +25601,13 @@ MonoBehaviour:
  _hitCooldown: 0.1
  _hitMode: 1
  _hitInterval: 0.5
+  _targetLayers:
+    serializedVersion: 2
+    m_Bits: 32768
  _id: 
  _rivalHitBoxMask:
    serializedVersion: 2
-    m_Bits: 512
+    m_Bits: 0
 --- !u!58 &1380656263
 CircleCollider2D:
  m_ObjectHideFlags: 0
@@ -26015,7 +26296,7 @@ MonoBehaviour:
  _edgeCheckDownLen: 0.6
  _groundMask:
    serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 256
 --- !u!114 &1409939195
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -28100,6 +28381,37 @@ Transform:
  m_Children: []
  m_Father: {fileID: 368251301}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1476535862
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1476535863}
+  m_Layer: 0
+  m_Name: RespawnPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1476535863
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1476535862}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.04, y: -0.69, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 960547555}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1476942765
 GameObject:
  m_ObjectHideFlags: 0
@@ -208662,6 +208974,37 @@ Transform:
  m_Children: []
  m_Father: {fileID: 1223440397}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1608402817
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1608402818}
+  m_Layer: 0
+  m_Name: RespawnPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1608402818
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1608402817}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 6.3, y: -0.31, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2124924423}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1611181745
 GameObject:
  m_ObjectHideFlags: 0
@@ -215691,6 +216034,98 @@ PolygonCollider2D:
      - {x: -19.5, y: 7.5}
      - {x: -19.5, y: -2.5}
  m_UseDelaunayMesh: 0
+--- !u!1 &2040911887
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2040911888}
+  - component: {fileID: 2040911890}
+  - component: {fileID: 2040911889}
+  m_Layer: 27
+  m_Name: HurtBox
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2040911888
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2040911887}
+  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: 1288627279}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2040911889
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2040911887}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7b7a233d7f70aa4f86b473412b826de, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _onDamageDealt: {fileID: 0}
+  _onHitConfirmed: {fileID: 0}
+--- !u!61 &2040911890
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2040911887}
+  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, y: 0}
+  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: 2, y: 0.3}
+  m_EdgeRadius: 0
 --- !u!1 &2043137490
 GameObject:
  m_ObjectHideFlags: 0
@@ -216962,6 +217397,102 @@ Transform:
  m_Children: []
  m_Father: {fileID: 432776958}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2124924420
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2124924423}
+  - component: {fileID: 2124924422}
+  - component: {fileID: 2124924421}
+  m_Layer: 24
+  m_Name: CheckpointMarker_1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2124924421
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2124924420}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81b8a6464ad9a90459fa28f2a0e1ce02, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _playerLayers:
+    serializedVersion: 2
+    m_Bits: 512
+  _respawnPoint: {fileID: 1608402818}
+  _onCheckpointReached: {fileID: 11400000, guid: 172e9bc777b1b4b4b99f47e43cbaedb1, type: 2}
+--- !u!61 &2124924422
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2124924420}
+  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, y: 0}
+  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, y: 2}
+  m_EdgeRadius: 0
+--- !u!4 &2124924423
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2124924420}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -20.24, y: 3.03, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1608402818}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2127047899
 GameObject:
  m_ObjectHideFlags: 0
@@ -217340,6 +217871,102 @@ Transform:
  m_Children: []
  m_Father: {fileID: 81962682}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2146472066
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2146472069}
+  - component: {fileID: 2146472068}
+  - component: {fileID: 2146472067}
+  m_Layer: 24
+  m_Name: CheckpointMarker
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2146472067
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2146472066}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81b8a6464ad9a90459fa28f2a0e1ce02, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _playerLayers:
+    serializedVersion: 2
+    m_Bits: 512
+  _respawnPoint: {fileID: 505494684}
+  _onCheckpointReached: {fileID: 11400000, guid: 172e9bc777b1b4b4b99f47e43cbaedb1, type: 2}
+--- !u!61 &2146472068
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2146472066}
+  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, y: 0}
+  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, y: 2}
+  m_EdgeRadius: 0
+--- !u!4 &2146472069
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2146472066}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -24.6, y: 2.05, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 505494684}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
@@ -217348,3 +217975,7 @@ SceneRoots:
  - {fileID: 1354690328}
  - {fileID: 783576435}
  - {fileID: 1409939202}
+  - {fileID: 1288627279}
+  - {fileID: 2146472069}
+  - {fileID: 2124924423}
+  - {fileID: 960547555}