diff --git a/assets/effects/glow-inner.effect b/assets/effects/sprite-glow-inner.effect similarity index 100% rename from assets/effects/glow-inner.effect rename to assets/effects/sprite-glow-inner.effect diff --git a/assets/effects/glow-inner.effect.meta b/assets/effects/sprite-glow-inner.effect.meta similarity index 100% rename from assets/effects/glow-inner.effect.meta rename to assets/effects/sprite-glow-inner.effect.meta diff --git a/assets/materials/glow-inner.mtl b/assets/materials/sprite-glow-inner.mtl similarity index 100% rename from assets/materials/glow-inner.mtl rename to assets/materials/sprite-glow-inner.mtl diff --git a/assets/materials/glow-inner.mtl.meta b/assets/materials/sprite-glow-inner.mtl.meta similarity index 100% rename from assets/materials/glow-inner.mtl.meta rename to assets/materials/sprite-glow-inner.mtl.meta diff --git a/assets/scenes/GlowInnerEffectScene.fire b/assets/scenes/GlowInnerEffectScene.fire index 7987573..ec44d6b 100755 --- a/assets/scenes/GlowInnerEffectScene.fire +++ b/assets/scenes/GlowInnerEffectScene.fire @@ -78,10 +78,10 @@ "_active": true, "_components": [ { - "__id__": 132 + "__id__": 134 }, { - "__id__": 133 + "__id__": 135 } ], "_prefab": null, @@ -251,7 +251,7 @@ "_active": true, "_components": [ { - "__id__": 131 + "__id__": 133 } ], "_prefab": null, @@ -4745,7 +4745,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 115.20000000000002, + 23.039999999999992, 0, 0, 0, @@ -4924,7 +4924,7 @@ "_N$handle": { "__id__": 105 }, - "_N$progress": 0.5, + "_N$progress": 0.1, "_id": "eaB07N7+FEiIyvpYG+V4DM" }, { @@ -5158,15 +5158,18 @@ }, { "__id__": 127 + }, + { + "__id__": 129 } ], "_active": true, "_components": [ { - "__id__": 129 + "__id__": 131 }, { - "__id__": 130 + "__id__": 132 } ], "_prefab": null, @@ -5181,7 +5184,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 384, - "height": 682.4 + "height": 459.33 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5193,7 +5196,7 @@ "ctor": "Float64Array", "array": [ 288, - 341.2, + 229.665, 0, 0, 0, @@ -5225,7 +5228,7 @@ "__id__": 114 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 116 @@ -5382,7 +5385,7 @@ "ctor": "Float64Array", "array": [ 0, - -243, + -135, 0, 0, 0, @@ -5506,7 +5509,7 @@ "ctor": "Float64Array", "array": [ 0, - -456, + -348, 0, 0, 0, @@ -5597,7 +5600,7 @@ "__id__": 114 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 125 @@ -5715,13 +5718,13 @@ }, { "__type__": "cc.Node", - "_name": "New Label", + "_name": "SystemFont", "_objFlags": 0, "_parent": { "__id__": 114 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 128 @@ -5789,8 +5792,8 @@ } ], "_useOriginalSize": false, - "_string": "Label", - "_N$string": "Label", + "_string": "System Font", + "_N$string": "System Font", "_fontSize": 40, "_lineHeight": 40, "_enableWrapText": true, @@ -5805,6 +5808,100 @@ "_N$cacheMode": 0, "_id": "d1whc7H8RHdrROcYj+2Qh1" }, + { + "__type__": "cc.Node", + "_name": "BmFont", + "_objFlags": 0, + "_parent": { + "__id__": 114 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 130 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 167.5, + "height": 33.33 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -442.665, + 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": "e4XmdmRoVPxKoDxfbOgm42" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 129 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "2c760728-404d-4553-a1d0-7ab18263845c" + } + ], + "_useOriginalSize": false, + "_string": "BM Font", + "_N$string": "BM Font", + "_fontSize": 40, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": { + "__uuid__": "4c95de7e-8cca-47bf-a446-47b7594e0992" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_batchAsBitmap": false, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "7cXLgoUJhDP7BPjr4yx+Ep" + }, { "__type__": "cc.Widget", "_name": "", @@ -5843,7 +5940,7 @@ "_layoutSize": { "__type__": "cc.Size", "width": 384, - "height": 682.4 + "height": 459.33 }, "_resize": 1, "_N$layoutType": 2, diff --git a/assets/scripts/GlowInnerEffectScene.ts b/assets/scripts/GlowInnerEffectScene.ts index e7b13c6..0fc480b 100644 --- a/assets/scripts/GlowInnerEffectScene.ts +++ b/assets/scripts/GlowInnerEffectScene.ts @@ -77,8 +77,9 @@ export default class GlowInnerEffectScene extends cc.Component { let realGlowWidthProgress = this._glowWidthSlider.progress * 0.1; this._glowWidthSliderLabel.string = `${realGlowWidthProgress.toFixed(2)}`; - // 这里为约束一下值发光阈值值在 [0.0, 0.2] 因为 0.2+ 之后的效果可能就是其他效果，也可以自己修改这里 - let realGlowThresholdProgress = this._glowThresholdSlider.progress * 0.2; + // 这里为约束一下值发光阈值值在 [0.0, 0.5] 因为 0.5+ 之后的效果可能就是其他效果，也可以自己修改这里 + // let realGlowThresholdProgress = this._glowThresholdSlider.progress * 0.5; + let realGlowThresholdProgress = this._glowThresholdSlider.progress; this._glowThresholdSliderLabel.string = `${realGlowThresholdProgress.toFixed(2)}`; // 更新材质 diff --git a/assets/textures/xmlBMFont.fnt b/assets/textures/xmlBMFont.fnt new file mode 100755 index 0000000..a575a23 --- /dev/null +++ b/assets/textures/xmlBMFont.fnt @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/textures/xmlBMFont.fnt.meta b/assets/textures/xmlBMFont.fnt.meta new file mode 100644 index 0000000..7d71833 --- /dev/null +++ b/assets/textures/xmlBMFont.fnt.meta @@ -0,0 +1,7 @@ +{ + "ver": "2.1.0", + "uuid": "4c95de7e-8cca-47bf-a446-47b7594e0992", + "textureUuid": "a5454758-921f-46ab-a314-0a7936d03be7", + "fontSize": 48, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/textures/xmlBMFont.png b/assets/textures/xmlBMFont.png new file mode 100755 index 0000000..80b92e4 Binary files /dev/null and b/assets/textures/xmlBMFont.png differ diff --git a/assets/textures/xmlBMFont.png.meta b/assets/textures/xmlBMFont.png.meta new file mode 100644 index 0000000..5321493 --- /dev/null +++ b/assets/textures/xmlBMFont.png.meta @@ -0,0 +1,34 @@ +{ + "ver": "2.3.3", + "uuid": "a5454758-921f-46ab-a314-0a7936d03be7", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "platformSettings": {}, + "subMetas": { + "xmlBMFont": { + "ver": "1.0.4", + "uuid": "3982ad46-6016-4e58-a083-8fe4d8866553", + "rawTextureUuid": "a5454758-921f-46ab-a314-0a7936d03be7", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 2, + "width": 1110, + "height": 508, + "rawWidth": 1114, + "rawHeight": 512, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file