From 72f9037feaafa0688b8d695b3a3d660ec11cc10d Mon Sep 17 00:00:00 2001 From: caizhitao Date: Fri, 7 Feb 2020 15:13:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/scenes/PreviewEffectScene.fire | 674 +++++++++++++++++++++++++- 1 file changed, 658 insertions(+), 16 deletions(-) diff --git a/assets/scenes/PreviewEffectScene.fire b/assets/scenes/PreviewEffectScene.fire index 06faed2..849c59e 100755 --- a/assets/scenes/PreviewEffectScene.fire +++ b/assets/scenes/PreviewEffectScene.fire @@ -78,10 +78,10 @@ "_active": true, "_components": [ { - "__id__": 67 + "__id__": 81 }, { - "__id__": 68 + "__id__": 82 } ], "_prefab": null, @@ -245,13 +245,13 @@ "__id__": 9 }, { - "__id__": 63 + "__id__": 77 } ], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 80 } ], "_prefab": null, @@ -444,7 +444,7 @@ "_active": true, "_components": [ { - "__id__": 62 + "__id__": 76 }, { "__id__": 14 @@ -516,10 +516,10 @@ "__id__": 13 }, { - "__id__": 60 + "__id__": 74 }, { - "__id__": 61 + "__id__": 75 } ], "_prefab": null, @@ -738,15 +738,21 @@ }, { "__id__": 51 + }, + { + "__id__": 58 + }, + { + "__id__": 65 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 72 }, { - "__id__": 59 + "__id__": 73 } ], "_prefab": null, @@ -761,7 +767,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 960, - "height": 688.8 + "height": 1025.2 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2332,7 +2338,7 @@ "_enabled": true, "_materials": [ { - "__uuid__": "642c2d0e-7eb6-4d65-96f2-d6e0d0305310" + "__uuid__": "a86e8864-5390-443f-b41b-b38e9d584c43" } ], "_srcBlendFactor": 770, @@ -2705,6 +2711,642 @@ "_N$affectedByScale": false, "_id": "87SQn11LJK8LSoPIN0g/TI" }, + { + "__type__": "cc.Node", + "_name": "FlashLight", + "_objFlags": 0, + "_parent": { + "__id__": 15 + }, + "_children": [ + { + "__id__": 59 + }, + { + "__id__": 62 + } + ], + "_active": true, + "_components": [ + { + "__id__": 64 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 260, + "height": 320.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -334, + -849, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "e26JcB/cRAdJ9F2/8dC4Ps" + }, + { + "__type__": "cc.Node", + "_name": "Desc", + "_objFlags": 0, + "_parent": { + "__id__": 58 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 60 + }, + { + "__id__": 61 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 260, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 135, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "0cICJzfMhPC6HKH6XkovKi" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 59 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 40, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 120, + "_originalHeight": 0, + "_id": "06QW1Iw/JJ6JrueKHmlJxn" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 59 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_useOriginalSize": false, + "_string": "扫光", + "_N$string": "扫光", + "_fontSize": 40, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 2, + "_N$cacheMode": 0, + "_id": "39Rl1S5YpMCZBL0hZ4CbrE" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 58 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 63 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 195, + "height": 270 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -25.200000000000003, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "0bICBpJO9Cs5B6u5KwtOTP" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 62 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "43a22f18-72fc-4399-b5ae-8305705861f4" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "31bc895a-c003-4566-a9f3-2e54ae1c17dc" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "8bGDB+EpZMTq52S0HrfFmI" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 58 + }, + "_enabled": true, + "_layoutSize": { + "__type__": "cc.Size", + "width": 260, + "height": 320.4 + }, + "_resize": 1, + "_N$layoutType": 2, + "_N$padding": 0, + "_N$cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_N$startAxis": 0, + "_N$paddingLeft": 0, + "_N$paddingRight": 0, + "_N$paddingTop": 0, + "_N$paddingBottom": 0, + "_N$spacingX": 0, + "_N$spacingY": 0, + "_N$verticalDirection": 1, + "_N$horizontalDirection": 0, + "_N$affectedByScale": false, + "_id": "f5ScM1NrdKF6FTjeq/h+Bj" + }, + { + "__type__": "cc.Node", + "_name": "GaussianBlur", + "_objFlags": 0, + "_parent": { + "__id__": 15 + }, + "_children": [ + { + "__id__": 66 + }, + { + "__id__": 69 + } + ], + "_active": true, + "_components": [ + { + "__id__": 71 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 260, + "height": 320.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -58, + -849, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "c7EbMAcO1CPYSl8IFqizWb" + }, + { + "__type__": "cc.Node", + "_name": "Desc", + "_objFlags": 0, + "_parent": { + "__id__": 65 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 67 + }, + { + "__id__": 68 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 260, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 135, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "acSrkkDmpAFYh9NiU/laBt" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 66 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 40, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 120, + "_originalHeight": 0, + "_id": "cc6PQ3Og9EK7pwLA+Qvgnc" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 66 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_useOriginalSize": false, + "_string": "高斯模糊", + "_N$string": "高斯模糊", + "_fontSize": 40, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 2, + "_N$cacheMode": 0, + "_id": "b90QlEd+9GhIDA3c7EnSyG" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 65 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 70 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 195, + "height": 270 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -25.200000000000003, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "a7siexXvFC+ZekYQX2vUad" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 69 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "dd3d8f78-9b79-4ca7-9bf7-7a09f7b34108" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "31bc895a-c003-4566-a9f3-2e54ae1c17dc" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "3fCXDRFtVMFqH5CPA6AJug" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 65 + }, + "_enabled": true, + "_layoutSize": { + "__type__": "cc.Size", + "width": 260, + "height": 320.4 + }, + "_resize": 1, + "_N$layoutType": 2, + "_N$padding": 0, + "_N$cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_N$startAxis": 0, + "_N$paddingLeft": 0, + "_N$paddingRight": 0, + "_N$paddingTop": 0, + "_N$paddingBottom": 0, + "_N$spacingX": 0, + "_N$spacingY": 0, + "_N$verticalDirection": 1, + "_N$horizontalDirection": 0, + "_N$affectedByScale": false, + "_id": "fd8A1grOlMH4IDJnmVok0F" + }, { "__type__": "cc.Widget", "_name": "", @@ -2743,7 +3385,7 @@ "_layoutSize": { "__type__": "cc.Size", "width": 960, - "height": 688.8 + "height": 1025.2 }, "_resize": 1, "_N$layoutType": 3, @@ -2862,10 +3504,10 @@ "_active": true, "_components": [ { - "__id__": 64 + "__id__": 78 }, { - "__id__": 65 + "__id__": 79 } ], "_prefab": null, @@ -2921,7 +3563,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 77 }, "_enabled": true, "_materials": [ @@ -2951,7 +3593,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 77 }, "_enabled": true, "alignMode": 1, From d967209a713cda8d0d8411f1b6da7bc4d852e59a Mon Sep 17 00:00:00 2001 From: caizhitao Date: Fri, 7 Feb 2020 15:14:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=20Cocos=20Creator=202.2.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.json b/project.json index 5cfb63c..0046599 100755 --- a/project.json +++ b/project.json @@ -1,6 +1,6 @@ { "engine": "cocos2d-html5", "packages": "packages", - "version": "2.2.1", + "version": "2.2.2", "id": "7e74e9ed-5c28-4e81-ae0e-5a67f548022c" } \ No newline at end of file From 261f390687e5f3d4c52c26134859f78c22d9d6fc Mon Sep 17 00:00:00 2001 From: caizhitao Date: Fri, 7 Feb 2020 15:17:57 +0800 Subject: [PATCH 3/3] update README.md and CHANGELOG.md --- CHANGELOG.md | 4 ++++ README.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 415b9dd..4153d2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # ChangeLog +## 0.8.0 (2020-02-07) + +- 支持 Cocos Creator v2.2.2 + ## 0.7.0 (2020-02-07) - 加入高斯模糊V1版本（纯原理篇） diff --git a/README.md b/README.md index 0239e8b..fe4d644 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cocos Creator Shader Effect Demo -[![](https://img.shields.io/badge/Release-0.7.0-green.svg)](CHANGELOG.md) +[![](https://img.shields.io/badge/Release-0.8.0-green.svg)](CHANGELOG.md) [![](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE) [![](https://img.shields.io/badge/Support-Cocos%20Creator%20v2.2.1-orange.svg)](http://www.cocos.com/creator)