Merge branch 'dev' into feature/gaussian_blur

2020-01-20 22:05:50 +08:00
parent c047efb715 c2693616d0
commit c65106941e
21 changed files with 2276 additions and 543 deletions
--- a/assets/materials/sprite-round-corner-crop-v1.mtl
+++ b/assets/materials/sprite-round-corner-crop-v1.mtl
@@ -10,7 +10,5 @@
    "USE_TEXTURE": true,
    "ENABLE_ROUNDCORNER": true
  },
-  "_props": {
-    "roundCornerRadius": 0.1
-  }
+  "_props": {}
 }
--- a/assets/materials/sprite-round-corner-crop-v1.mtl.meta
+++ b/assets/materials/sprite-round-corner-crop-v1.mtl.meta
--- a/assets/materials/sprite-round-corner-crop-v2.mtl
+++ b/assets/materials/sprite-round-corner-crop-v2.mtl
@@ -0,0 +1,14 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "7c24b57e-e819-4fc9-a8d2-b06cf61b782d"
+  },
+  "_defines": {
+    "USE_TEXTURE": true,
+    "ENABLE_ROUNDCORNER": true
+  },
+  "_props": {}
+}
--- a/assets/materials/sprite-round-corner-crop-v2.mtl.meta
+++ b/assets/materials/sprite-round-corner-crop-v2.mtl.meta
@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "a86e8864-5390-443f-b41b-b38e9d584c43",
+  "dataAsSubAsset": null,
+  "subMetas": {}
+}