2026-05-15 충돌오류 진행중

2026-05-15 18:07:50 +09:00
parent ec353d0fd4
commit 53e7f3b302
33 changed files with 902 additions and 65 deletions
--- a/Assets/05_Data/Attack/Kick_A.asset
+++ b/Assets/05_Data/Attack/Kick_A.asset
--- a/Assets/05_Data/Attack/Kick_B.asset
+++ b/Assets/05_Data/Attack/Kick_B.asset
--- a/Assets/05_Data/Attack/Kick_C.asset
+++ b/Assets/05_Data/Attack/Kick_C.asset
--- a/Assets/05_Data/Attack/Punch_A.asset
+++ b/Assets/05_Data/Attack/Punch_A.asset
--- a/Assets/05_Data/Attack/Punch_B.asset
+++ b/Assets/05_Data/Attack/Punch_B.asset
--- a/Assets/05_Data/Attack/Punch_C.asset
+++ b/Assets/05_Data/Attack/Punch_C.asset
--- a/Assets/05_Data/Combo/Combo_Dash.asset
+++ b/Assets/05_Data/Combo/Combo_Dash.asset
--- a/Assets/05_Data/Combo/Combo_Dash.asset.meta
+++ b/Assets/05_Data/Combo/Combo_Dash.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2c47ad8605b4f23a77d8f77bcebe312
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/05_Data/Combo/Combo_Kick_A.asset
+++ b/Assets/05_Data/Combo/Combo_Kick_A.asset
--- a/Assets/05_Data/Combo/Combo_Kick_B.asset
+++ b/Assets/05_Data/Combo/Combo_Kick_B.asset
--- a/Assets/05_Data/Combo/Combo_Kick_C.asset
+++ b/Assets/05_Data/Combo/Combo_Kick_C.asset
--- a/Assets/05_Data/Combo/Combo_Punch_A.asset
+++ b/Assets/05_Data/Combo/Combo_Punch_A.asset
--- a/Assets/05_Data/Combo/Combo_Punch_B.asset
+++ b/Assets/05_Data/Combo/Combo_Punch_B.asset
--- a/Assets/05_Data/Combo/Combo_Punch_C.asset
+++ b/Assets/05_Data/Combo/Combo_Punch_C.asset
--- a/Assets/05_Data/Combo/Combo_Roll.asset
+++ b/Assets/05_Data/Combo/Combo_Roll.asset
--- a/Assets/05_Data/Combo/Combo_Roll.asset.meta
+++ b/Assets/05_Data/Combo/Combo_Roll.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 25cae4aa2eed34745ae44f422fe7db0b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/05_Data/Motion.meta
+++ b/Assets/05_Data/Motion.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c9e5f4a7b3649ce8f2a53d91b0c7e6a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/05_Data/Motion/Dash.asset
+++ b/Assets/05_Data/Motion/Dash.asset
--- a/Assets/05_Data/Motion/Dash.asset.meta
+++ b/Assets/05_Data/Motion/Dash.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b31f0b5b733f4f1a8c9cb9bb96a5334e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/05_Data/Motion/Roll.asset
+++ b/Assets/05_Data/Motion/Roll.asset
--- a/Assets/05_Data/Motion/Roll.asset.meta
+++ b/Assets/05_Data/Motion/Roll.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8604a664935ecec4b82c162eca1ba4b6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: