Merge branch 'master' into Enemies-Players-Animations

assets/Media/Prefabs/Game/Effects/PickBonus.prefab

@@ -28,10 +28,13 @@
       },
       {
         "__id__": 6
+      },
+      {
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 10
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -160,6 +163,26 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "3ag4rexLNJW6A/sp6OpwZ8"
   },
+  {
+    "__type__": "0f2b2zQHR5IYoIfX8uDxOwj",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "animation": {
+      "__id__": 6
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a1aUx8U+FGmqrGQlPCmH17"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/Media/Prefabs/Game/Player.prefab

@@ -2928,6 +2928,9 @@
     "animation": {
       "__id__": 7
     },
+    "sprite": {
+      "__id__": 5
+    },
     "_id": ""
   },
   {