Merge branch 'master' of http://103.147.34.20:30081/trung.ha/minecraft-hero-merge-battle

Assets/Game-Resources/Prefabs/AssetManager_halloween.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6c1037fea0ef9d24ca5926b060eae70f, type: 3}
   m_Name: AssetManager_halloween
   m_EditorClassIdentifier: 
-  islandLockColor: {r: 0.4245283, g: 0.4245283, b: 0.4245283, a: 1}
+  islandLockColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
   boomPrefab: {fileID: 4054640496496788898, guid: 80b36f3fab8849a4abe3448bf4054ca7, type: 3}
   boomMaterial: {fileID: 2100000, guid: c96e0bbb7ccea5e4d88c9f06edea03b9, type: 2}
   levels:
@@ -376,10 +376,10 @@ MonoBehaviour:
   - icon: {fileID: 21300000, guid: 4b8fd1b59a431b94bbbd2c9fca232057, type: 3}
     prefab: {fileID: 7286166790109509275, guid: 84057fc299e6a7c42a6bb5453570da5a, type: 3}
   fruits:
-  - icon: {fileID: 21300000, guid: 89a3f801034d5284eb4b6f8dbfeb0b79, type: 3}
-    bigIcon: {fileID: 21300000, guid: 89a3f801034d5284eb4b6f8dbfeb0b79, type: 3}
-    prefab: {fileID: 1325549410457538723, guid: ca0402974aebf124facf1a75050b15df, type: 3}
-    attach: {fileID: 7324133371155367392, guid: 8f7004b0a5cefd2419b6dd63b5910f1e, type: 3}
+  - icon: {fileID: 21300000, guid: e801fa576f9588343af1582b5fcaca21, type: 3}
+    bigIcon: {fileID: 21300000, guid: e801fa576f9588343af1582b5fcaca21, type: 3}
+    prefab: {fileID: 431924510064725788, guid: 182dc4515528e2e459803fba8f06fd39, type: 3}
+    attach: {fileID: 1720300804529466878, guid: 1d92b9c4d0063244aa6a6f68cb7997db, type: 3}
   - icon: {fileID: 21300000, guid: cc483fdaa194f3c4980d3a580212d02e, type: 3}
     bigIcon: {fileID: 21300000, guid: cc483fdaa194f3c4980d3a580212d02e, type: 3}
     prefab: {fileID: 5893697160799687188, guid: eafcf0c8f31b60140a0a637d420f5ce5, type: 3}
@@ -404,10 +404,10 @@ MonoBehaviour:
     bigIcon: {fileID: 21300000, guid: f7eabd7c17119d64cad9c5172875da16, type: 3}
     prefab: {fileID: 467891558220694859, guid: c2b515c8b562f1b4f9c0d11aadf7d87a, type: 3}
     attach: {fileID: 9056450501585949633, guid: c8575d2570ba0fd43944b5742b34cbc1, type: 3}
-  - icon: {fileID: 21300000, guid: e801fa576f9588343af1582b5fcaca21, type: 3}
-    bigIcon: {fileID: 21300000, guid: e801fa576f9588343af1582b5fcaca21, type: 3}
-    prefab: {fileID: 431924510064725788, guid: 182dc4515528e2e459803fba8f06fd39, type: 3}
-    attach: {fileID: 1720300804529466878, guid: 1d92b9c4d0063244aa6a6f68cb7997db, type: 3}
+  - icon: {fileID: 21300000, guid: 89a3f801034d5284eb4b6f8dbfeb0b79, type: 3}
+    bigIcon: {fileID: 21300000, guid: 89a3f801034d5284eb4b6f8dbfeb0b79, type: 3}
+    prefab: {fileID: 1325549410457538723, guid: ca0402974aebf124facf1a75050b15df, type: 3}
+    attach: {fileID: 7324133371155367392, guid: 8f7004b0a5cefd2419b6dd63b5910f1e, type: 3}
   - icon: {fileID: 21300000, guid: 5bbe21d68c3d5db4d95f4c9cbaa9cdfc, type: 3}
     bigIcon: {fileID: 21300000, guid: 5bbe21d68c3d5db4d95f4c9cbaa9cdfc, type: 3}
     prefab: {fileID: 431924510064725788, guid: a7590c32c0949164a88b80822d814902, type: 3}