From 78b1111043f16e560726db209ca01539231b5fd0 Mon Sep 17 00:00:00 2001
From: Martin <mail2maras@gmail.com>
Date: Tue, 20 Dec 2022 11:48:06 +0100
Subject: [PATCH] Merge

---
 assets/Media/Prefabs/Game/Drops/Gold.prefab | 28 +++------------------
 assets/Media/Prefabs/Game/Skeleton.prefab   |  4 +++
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/assets/Media/Prefabs/Game/Drops/Gold.prefab b/assets/Media/Prefabs/Game/Drops/Gold.prefab
index 5be8876..302fd72 100644
--- a/assets/Media/Prefabs/Game/Drops/Gold.prefab
+++ b/assets/Media/Prefabs/Game/Drops/Gold.prefab
@@ -38,13 +38,10 @@
       },
       {
         "__id__": 18
-      },
-      {
-        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -305,23 +302,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "cfXyVJoitMGp/0liEUZfNP"
   },
-  {
-    "__type__": "7a536G2OudFtpTsoF8yLXiW",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 15
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "72AObOIbxCf6LIYsYqoFZF"
-  },
   {
     "__type__": "cc.Animation",
     "_name": "",
@@ -331,7 +311,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 15
     },
     "playOnLoad": true,
     "_clips": [
@@ -359,7 +339,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 17
     },
     "tag": 0,
     "_group": 128,
@@ -392,7 +372,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 19
     },
     "_id": ""
   },
diff --git a/assets/Media/Prefabs/Game/Skeleton.prefab b/assets/Media/Prefabs/Game/Skeleton.prefab
index a6d5608..2f3c651 100644
--- a/assets/Media/Prefabs/Game/Skeleton.prefab
+++ b/assets/Media/Prefabs/Game/Skeleton.prefab
@@ -274,6 +274,10 @@
     "sprite": {
       "__id__": 5
     },
+    "defaultMaterial": {
+      "__uuid__": "fda095cb-831d-4601-ad94-846013963de8",
+      "__expectedType__": "cc.Material"
+    },
     "whiteMaterial": {
       "__uuid__": "9cb17675-370b-48ed-bfa2-bb613a88af44",
       "__expectedType__": "cc.Material"