From 534ad12fc8906d9cacb59c7c07383fba1abb206c Mon Sep 17 00:00:00 2001 From: caizhitao Date: Wed, 18 Dec 2019 22:35:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ffect => builtin-2d-sprite-explain.effect} | 0 ... => builtin-2d-sprite-explain.effect.meta} | 0 .../{sprite-outline.effect => outline.effect} | 2 +- ...utline.effect.meta => outline.effect.meta} | 0 ...mple.mtl => builtin-2d-sprite-explain.mtl} | 0 ...eta => builtin-2d-sprite-explain.mtl.meta} | 0 .../{sprite-outline.mtl => outline.mtl} | 0 ...rite-outline.mtl.meta => outline.mtl.meta} | 0 ...MainScene.fire => OutlineEffectScene.fire} | 107 +----------------- ...fire.meta => OutlineEffectScene.fire.meta} | 0 10 files changed, 6 insertions(+), 103 deletions(-) rename assets/effects/{sprite-example.effect => builtin-2d-sprite-explain.effect} (100%) rename assets/effects/{sprite-example.effect.meta => builtin-2d-sprite-explain.effect.meta} (100%) rename assets/effects/{sprite-outline.effect => outline.effect} (99%) rename assets/effects/{sprite-outline.effect.meta => outline.effect.meta} (100%) rename assets/materials/{sprite-example.mtl => builtin-2d-sprite-explain.mtl} (100%) rename assets/materials/{sprite-example.mtl.meta => builtin-2d-sprite-explain.mtl.meta} (100%) rename assets/materials/{sprite-outline.mtl => outline.mtl} (100%) rename assets/materials/{sprite-outline.mtl.meta => outline.mtl.meta} (100%) rename assets/scenes/{MainScene.fire => OutlineEffectScene.fire} (84%) rename assets/scenes/{MainScene.fire.meta => OutlineEffectScene.fire.meta} (100%) diff --git a/assets/effects/sprite-example.effect b/assets/effects/builtin-2d-sprite-explain.effect similarity index 100% rename from assets/effects/sprite-example.effect rename to assets/effects/builtin-2d-sprite-explain.effect diff --git a/assets/effects/sprite-example.effect.meta b/assets/effects/builtin-2d-sprite-explain.effect.meta similarity index 100% rename from assets/effects/sprite-example.effect.meta rename to assets/effects/builtin-2d-sprite-explain.effect.meta diff --git a/assets/effects/sprite-outline.effect b/assets/effects/outline.effect similarity index 99% rename from assets/effects/sprite-outline.effect rename to assets/effects/outline.effect index 5fd3cf1..b8f0917 100644 --- a/assets/effects/sprite-outline.effect +++ b/assets/effects/outline.effect @@ -1,5 +1,5 @@ // Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. - +// 描边特效 CCEffect %{ techniques: - passes: diff --git a/assets/effects/sprite-outline.effect.meta b/assets/effects/outline.effect.meta similarity index 100% rename from assets/effects/sprite-outline.effect.meta rename to assets/effects/outline.effect.meta diff --git a/assets/materials/sprite-example.mtl b/assets/materials/builtin-2d-sprite-explain.mtl similarity index 100% rename from assets/materials/sprite-example.mtl rename to assets/materials/builtin-2d-sprite-explain.mtl diff --git a/assets/materials/sprite-example.mtl.meta b/assets/materials/builtin-2d-sprite-explain.mtl.meta similarity index 100% rename from assets/materials/sprite-example.mtl.meta rename to assets/materials/builtin-2d-sprite-explain.mtl.meta diff --git a/assets/materials/sprite-outline.mtl b/assets/materials/outline.mtl similarity index 100% rename from assets/materials/sprite-outline.mtl rename to assets/materials/outline.mtl diff --git a/assets/materials/sprite-outline.mtl.meta b/assets/materials/outline.mtl.meta similarity index 100% rename from assets/materials/sprite-outline.mtl.meta rename to assets/materials/outline.mtl.meta diff --git a/assets/scenes/MainScene.fire b/assets/scenes/OutlineEffectScene.fire similarity index 84% rename from assets/scenes/MainScene.fire rename to assets/scenes/OutlineEffectScene.fire index 3c7cff9..16df6fe 100755 --- a/assets/scenes/MainScene.fire +++ b/assets/scenes/OutlineEffectScene.fire @@ -79,18 +79,15 @@ }, { "__id__": 10 - }, - { - "__id__": 12 } ], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 12 }, { - "__id__": 15 + "__id__": 13 } ], "_prefab": null, @@ -180,7 +177,7 @@ "array": [ 0, 0, - 351.60631393648214, + 491.0364039457767, 0, 0, 0, @@ -365,7 +362,7 @@ }, { "__type__": "cc.Node", - "_name": "CocosLogoSprite", + "_name": "Sprite", "_objFlags": 0, "_parent": { "__id__": 2 @@ -459,7 +456,7 @@ }, { "__type__": "cc.Node", - "_name": "HelloLabel", + "_name": "Label", "_objFlags": 0, "_parent": { "__id__": 2 @@ -549,100 +546,6 @@ "_N$cacheMode": 0, "_id": "9fH5zrVThO/I9ly3o3xhIT" }, - { - "__type__": "cc.Node", - "_name": "ball_00", - "_objFlags": 0, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 13 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 60, - "height": 60 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -243, - 106, - 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": "7c8OSA1YJNqKRZUzDDNpTz" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 12 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "daf44951-2c80-4778-b99f-52cfc78ab053" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "d0b78623-4e79-4de1-b1d2-ea211bf4652c" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "07Kzm51XBOGJMcszXVW8uC" - }, { "__type__": "cc.Canvas", "_name": "", diff --git a/assets/scenes/MainScene.fire.meta b/assets/scenes/OutlineEffectScene.fire.meta similarity index 100% rename from assets/scenes/MainScene.fire.meta rename to assets/scenes/OutlineEffectScene.fire.meta