Merge remote-tracking branch 'tetra-tower/ddd' into tetris

Assets/Prefabs/Characters/Player.prefab

@@ -42,6 +42,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4710911479571038}
   - component: {fileID: 61129044981816742}
+  - component: {fileID: 114402380471012178}
   m_Layer: 0
   m_Name: AttackColider
   m_TagString: Untagged
@@ -92,7 +93,7 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 5
   m_Material: {fileID: 0}
-  m_Interpolate: 0
+  m_Interpolate: 1
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 4
@@ -176,37 +177,46 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   rbGravityScale: 3
-  rbAttackGravityScale: 3
-  maxSpeed: 3
-  maxDashSpeed: 6
-  accerlation: 1200
+  rbAttackGravityScale: 0.5
+  maxSpeed: 4
+  maxDashSpeed: 7
+  acceleration: 20
+  deceleration: 20
   jumpSpeed: 11
   ropeSpeed: 3
   doubleJumpSpeed: 10
-  dashAccerlation: 2000
-  isDashing: 0
-  platformArray: []
-  horizontal: 0
-  horizontalRaw: 0
-  dashStart: 0
+  dashAcceleration: 50
+  platformCollider: {fileID: 0}
   groundLayer:
     serializedVersion: 2
-    m_Bits: 256
+    m_Bits: 6400
   ropeLayer:
     serializedVersion: 2
     m_Bits: 512
+  boxHeight: 0.3
+  ropeUp: 0.6
+  ropeDown: 0.8
   platformLayer:
     serializedVersion: 2
     m_Bits: 2048
-  outerwallLayer:
-    serializedVersion: 2
-    m_Bits: 4096
-  ropeDistance: 0.3
-  rayDistance: 1
-  ropeUp: 0.6
-  ropeDown: 0.8
   playerState: 0
   previousState: 0
+--- !u!114 &114402380471012178
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1862495014651308}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  damage: 0
+  knockBackMultiplier: 1
+  debuffNum: 0
+  debuffType: 
+  debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
 --- !u!114 &114880704145925944
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -218,13 +228,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  state: 0
   attackRaw:
   - 0
   - 0
   - 0
   attackKeyState: 000000000000000000000000
-  cancel: 0
+  cancelRaw: 0
+  cancelKeyState: 0
   playingSkill: 0
   comboTime: 1
   time: {fileID: 0}