碰撞系统重做

assets/resources/game/heros/hero.prefab

@@ -569,7 +569,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "",
+    "defaultAnimation": "<None>",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 1,
@@ -1918,7 +1918,7 @@
     "fileId": "88a6VdbQBB7YwXovYCN2Sy"
   },
   {
-    "__type__": "cc.BoxCollider2D",
+    "__type__": "cc.RigidBody2D",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1929,45 +1929,11 @@
     "__prefab": {
       "__id__": 88
     },
-    "tag": 0,
-    "_group": 2,
-    "_density": 1,
-    "_sensor": false,
-    "_friction": 1,
-    "_restitution": 0,
-    "_offset": {
-      "__type__": "cc.Vec2",
-      "x": 2.6,
-      "y": 32.5
-    },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 24.5,
-      "height": 75.8
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b2Dt9lJI9FyJCDezkDBPBl"
-  },
-  {
-    "__type__": "cc.RigidBody2D",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 90
-    },
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
     "_group": 2,
-    "_type": 2,
+    "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 1,
     "_linearDamping": 0,
@@ -1985,6 +1951,40 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "d8rVs6intBQ7lRU8Dw4zXV"
   },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 90
+    },
+    "tag": 0,
+    "_group": 2,
+    "_density": 1,
+    "_sensor": false,
+    "_friction": 1,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 2.6,
+      "y": 34.5
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 81.9,
+      "height": 73.4
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b2Dt9lJI9FyJCDezkDBPBl"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {