refactor(hero): 重构英雄属性系统与受击特效
将HeroAttrSystem从HeroAttrsComp中分离为独立文件 删除废弃的05-outline-glow资源文件 优化TalComp.ts中的代码格式 使用FlashSprite替换旧的受击特效实现
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"ver": "1.2.0",
|
||||
"importer": "directory",
|
||||
"imported": true,
|
||||
"uuid": "af691440-7aca-4cb5-9a78-9bfed9cb70de",
|
||||
"files": [],
|
||||
"subMetas": {},
|
||||
"userData": {}
|
||||
}
|
||||
BIN
assets/resources/game/05-outline-glow/.DS_Store
vendored
BIN
assets/resources/game/05-outline-glow/.DS_Store
vendored
Binary file not shown.
@@ -1 +0,0 @@
|
||||
{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"551a2611-69c0-45ae-bfc6-37f056a34b33","files":[],"subMetas":{},"userData":{}}
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
"__type__": "cc.Material",
|
||||
"_name": "",
|
||||
"_objFlags": 0,
|
||||
"__editorExtras__": {},
|
||||
"_native": "",
|
||||
"_effectAsset": {
|
||||
"__uuid__": "cfeeea4f-db9c-42cd-a0f7-fc5cb37bd3d7",
|
||||
"__expectedType__": "cc.EffectAsset"
|
||||
},
|
||||
"_techIdx": 0,
|
||||
"_defines": [
|
||||
{
|
||||
"USE_TEXTURE": true
|
||||
}
|
||||
],
|
||||
"_states": [
|
||||
{
|
||||
"rasterizerState": {},
|
||||
"depthStencilState": {},
|
||||
"blendState": {
|
||||
"targets": [
|
||||
{}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"_props": [
|
||||
{
|
||||
"glowColor": {
|
||||
"__type__": "cc.Color",
|
||||
"r": 0,
|
||||
"g": 0,
|
||||
"b": 0,
|
||||
"a": 255
|
||||
},
|
||||
"glowWidth": 0.003,
|
||||
"glowThreshold": 0.645
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"2fcd55a9-38ca-45aa-9164-68e48aaf51ce","files":[".json"],"subMetas":{},"userData":{}}
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
"__type__": "cc.Material",
|
||||
"_name": "",
|
||||
"_objFlags": 0,
|
||||
"__editorExtras__": {},
|
||||
"_native": "",
|
||||
"_effectAsset": {
|
||||
"__uuid__": "40c25c17-db22-4ae7-8d3a-f73cbb6d36ba",
|
||||
"__expectedType__": "cc.EffectAsset"
|
||||
},
|
||||
"_techIdx": 0,
|
||||
"_defines": [
|
||||
{
|
||||
"USE_TEXTURE": true
|
||||
}
|
||||
],
|
||||
"_states": [
|
||||
{
|
||||
"rasterizerState": {},
|
||||
"depthStencilState": {},
|
||||
"blendState": {
|
||||
"targets": [
|
||||
{}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"_props": [
|
||||
{
|
||||
"glowColor": {
|
||||
"__type__": "cc.Color",
|
||||
"r": 255,
|
||||
"g": 235,
|
||||
"b": 0,
|
||||
"a": 255
|
||||
},
|
||||
"glowWidth": 0.002
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"974af3c9-d7ee-449f-a5df-cd8e2dd49188","files":[".json"],"subMetas":{},"userData":{}}
|
||||
@@ -1 +0,0 @@
|
||||
{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"7d369c63-9191-4323-abcc-edda5799a410","files":[],"subMetas":{},"userData":{}}
|
||||
@@ -1,169 +0,0 @@
|
||||
// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
|
||||
CCEffect %{
|
||||
techniques:
|
||||
- passes:
|
||||
- vert: sprite-vs:vert
|
||||
frag: sprite-fs:frag
|
||||
depthStencilState:
|
||||
depthTest: false
|
||||
depthWrite: false
|
||||
blendState:
|
||||
targets:
|
||||
- blend: true
|
||||
blendSrc: src_alpha
|
||||
blendDst: one_minus_src_alpha
|
||||
blendDstAlpha: one_minus_src_alpha
|
||||
rasterizerState:
|
||||
cullMode: none
|
||||
properties:
|
||||
alphaThreshold: { value: 0.5 }
|
||||
|
||||
glowColor: { value: [1, 1, 1, 1], editor: { type: color } }
|
||||
glowWidth: { value: 0.05, editor: { slide: true, range: [0, 0.3], step: 0.001 } }
|
||||
glowThreshold: { value: 1, editor: { slide: true, range: [0, 1], step: 0.001 } }
|
||||
}%
|
||||
|
||||
CCProgram sprite-vs %{
|
||||
precision highp float;
|
||||
#include <builtin/uniforms/cc-global>
|
||||
#if USE_LOCAL
|
||||
#include <builtin/uniforms/cc-local>
|
||||
#endif
|
||||
#if SAMPLE_FROM_RT
|
||||
#include <common/common-define>
|
||||
#endif
|
||||
in vec3 a_position;
|
||||
in vec2 a_texCoord;
|
||||
in vec4 a_color;
|
||||
|
||||
out vec4 color;
|
||||
out vec2 uv0;
|
||||
|
||||
vec4 vert () {
|
||||
vec4 pos = vec4(a_position, 1);
|
||||
|
||||
#if USE_LOCAL
|
||||
pos = cc_matWorld * pos;
|
||||
#endif
|
||||
|
||||
#if USE_PIXEL_ALIGNMENT
|
||||
pos = cc_matView * pos;
|
||||
pos.xyz = floor(pos.xyz);
|
||||
pos = cc_matProj * pos;
|
||||
#else
|
||||
pos = cc_matViewProj * pos;
|
||||
#endif
|
||||
|
||||
uv0 = a_texCoord;
|
||||
#if SAMPLE_FROM_RT
|
||||
CC_HANDLE_RT_SAMPLE_FLIP(uv0);
|
||||
#endif
|
||||
color = a_color;
|
||||
|
||||
return pos;
|
||||
}
|
||||
}%
|
||||
|
||||
CCProgram sprite-fs %{
|
||||
precision highp float;
|
||||
#include <builtin/internal/embedded-alpha>
|
||||
#include <builtin/internal/alpha-test>
|
||||
|
||||
in vec4 color;
|
||||
|
||||
uniform FSConstants {
|
||||
vec4 glowColor;
|
||||
float glowWidth;
|
||||
float glowThreshold;
|
||||
};
|
||||
|
||||
#if USE_TEXTURE
|
||||
in vec2 uv0;
|
||||
#pragma builtin(local)
|
||||
layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
|
||||
#endif
|
||||
|
||||
vec4 getTextureColor (sampler2D mainTexture, vec2 uv) {
|
||||
if (uv.x > 1.0 || uv.x < 0.0 || uv.y > 1.0 || uv.y < 0.0) {
|
||||
return vec4(0.0, 0.0, 0.0, 0.0);
|
||||
}
|
||||
return texture(mainTexture, uv);
|
||||
}
|
||||
|
||||
float getColorAlpha (float angle, float dist) {
|
||||
// 角度转弧度，公式为：弧度 = 角度 * (pi / 180)
|
||||
float radian = angle * 3.14 / 180.0;
|
||||
vec2 newUV = uv0 + vec2(dist * cos(radian), dist * sin(radian));
|
||||
vec4 color = getTextureColor(cc_spriteTexture, newUV);
|
||||
return color.a;
|
||||
}
|
||||
|
||||
float getAverageAlpha (float dist) {
|
||||
float totalAlpha = 0.0;
|
||||
|
||||
totalAlpha += getColorAlpha(0.0, dist);
|
||||
totalAlpha += getColorAlpha(30.0, dist);
|
||||
totalAlpha += getColorAlpha(60.0, dist);
|
||||
totalAlpha += getColorAlpha(90.0, dist);
|
||||
totalAlpha += getColorAlpha(120.0, dist);
|
||||
totalAlpha += getColorAlpha(150.0, dist);
|
||||
totalAlpha += getColorAlpha(180.0, dist);
|
||||
totalAlpha += getColorAlpha(210.0, dist);
|
||||
totalAlpha += getColorAlpha(240.0, dist);
|
||||
totalAlpha += getColorAlpha(270.0, dist);
|
||||
totalAlpha += getColorAlpha(300.0, dist);
|
||||
totalAlpha += getColorAlpha(330.0, dist);
|
||||
|
||||
return totalAlpha * 0.0833;
|
||||
}
|
||||
|
||||
float getGlowAlpha () {
|
||||
if (glowWidth == 0.0 ) {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
float totalAlpha = 0.0;
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.1);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.2);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.3);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.4);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.5);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.6);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.7);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.8);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.9);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 1.0);
|
||||
|
||||
return totalAlpha * 0.1;
|
||||
}
|
||||
|
||||
vec4 frag () {
|
||||
vec4 o = vec4(1, 1, 1, 1);
|
||||
|
||||
#if USE_TEXTURE
|
||||
o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0);
|
||||
#if IS_GRAY
|
||||
float gray = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b;
|
||||
o.r = o.g = o.b = gray;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
float alpha = getGlowAlpha();
|
||||
|
||||
if (alpha <= glowThreshold) {
|
||||
alpha /= glowThreshold;
|
||||
alpha = -1.0 * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) + 1.0;
|
||||
} else {
|
||||
alpha = 0.0;
|
||||
}
|
||||
|
||||
vec4 dstColor = glowColor * alpha;
|
||||
vec4 scrColor = o;
|
||||
|
||||
o = scrColor * scrColor.a + dstColor * (1.0 - scrColor.a);
|
||||
|
||||
o *= color;
|
||||
ALPHA_TEST(o);
|
||||
return o;
|
||||
}
|
||||
}%
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
"ver": "1.7.1",
|
||||
"importer": "effect",
|
||||
"imported": true,
|
||||
"uuid": "cfeeea4f-db9c-42cd-a0f7-fc5cb37bd3d7",
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"combinations": [
|
||||
{}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -1,169 +0,0 @@
|
||||
// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
|
||||
CCEffect %{
|
||||
techniques:
|
||||
- passes:
|
||||
- vert: sprite-vs:vert
|
||||
frag: sprite-fs:frag
|
||||
depthStencilState:
|
||||
depthTest: false
|
||||
depthWrite: false
|
||||
blendState:
|
||||
targets:
|
||||
- blend: true
|
||||
blendSrc: src_alpha
|
||||
blendDst: one_minus_src_alpha
|
||||
blendDstAlpha: one_minus_src_alpha
|
||||
rasterizerState:
|
||||
cullMode: none
|
||||
properties:
|
||||
alphaThreshold: { value: 0.5 }
|
||||
|
||||
glowColor: { value: [1, 1, 1, 1], editor: { type: color } }
|
||||
glowWidth: { value: 0.05, editor: { slide: true, range: [0, 0.3], step: 0.001 } }
|
||||
glowThreshold: { value: 1, editor: { slide: true, range: [0, 1], step: 0.001 } }
|
||||
}%
|
||||
|
||||
CCProgram sprite-vs %{
|
||||
precision highp float;
|
||||
#include <builtin/uniforms/cc-global>
|
||||
#if USE_LOCAL
|
||||
#include <builtin/uniforms/cc-local>
|
||||
#endif
|
||||
#if SAMPLE_FROM_RT
|
||||
#include <common/common-define>
|
||||
#endif
|
||||
in vec3 a_position;
|
||||
in vec2 a_texCoord;
|
||||
in vec4 a_color;
|
||||
|
||||
out vec4 color;
|
||||
out vec2 uv0;
|
||||
|
||||
vec4 vert () {
|
||||
vec4 pos = vec4(a_position, 1);
|
||||
|
||||
#if USE_LOCAL
|
||||
pos = cc_matWorld * pos;
|
||||
#endif
|
||||
|
||||
#if USE_PIXEL_ALIGNMENT
|
||||
pos = cc_matView * pos;
|
||||
pos.xyz = floor(pos.xyz);
|
||||
pos = cc_matProj * pos;
|
||||
#else
|
||||
pos = cc_matViewProj * pos;
|
||||
#endif
|
||||
|
||||
uv0 = a_texCoord;
|
||||
#if SAMPLE_FROM_RT
|
||||
CC_HANDLE_RT_SAMPLE_FLIP(uv0);
|
||||
#endif
|
||||
color = a_color;
|
||||
|
||||
return pos;
|
||||
}
|
||||
}%
|
||||
|
||||
CCProgram sprite-fs %{
|
||||
precision highp float;
|
||||
#include <builtin/internal/embedded-alpha>
|
||||
#include <builtin/internal/alpha-test>
|
||||
|
||||
in vec4 color;
|
||||
|
||||
uniform FSConstants {
|
||||
vec4 glowColor;
|
||||
float glowWidth;
|
||||
float glowThreshold;
|
||||
};
|
||||
|
||||
#if USE_TEXTURE
|
||||
in vec2 uv0;
|
||||
#pragma builtin(local)
|
||||
layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
|
||||
#endif
|
||||
|
||||
vec4 getTextureColor (sampler2D mainTexture, vec2 uv) {
|
||||
if (uv.x > 1.0 || uv.x < 0.0 || uv.y > 1.0 || uv.y < 0.0) {
|
||||
return vec4(0.0, 0.0, 0.0, 0.0);
|
||||
}
|
||||
return texture(mainTexture, uv);
|
||||
}
|
||||
|
||||
float getColorAlpha (float angle, float dist) {
|
||||
// 角度转弧度，公式为：弧度 = 角度 * (pi / 180)
|
||||
float radian = angle * 3.14 / 180.0;
|
||||
vec2 newUV = uv0 + vec2(dist * cos(radian), dist * sin(radian));
|
||||
vec4 color = getTextureColor(cc_spriteTexture, newUV);
|
||||
return color.a;
|
||||
}
|
||||
|
||||
float getAverageAlpha (float dist) {
|
||||
float totalAlpha = 0.0;
|
||||
|
||||
totalAlpha += getColorAlpha(0.0, dist);
|
||||
totalAlpha += getColorAlpha(30.0, dist);
|
||||
totalAlpha += getColorAlpha(60.0, dist);
|
||||
totalAlpha += getColorAlpha(90.0, dist);
|
||||
totalAlpha += getColorAlpha(120.0, dist);
|
||||
totalAlpha += getColorAlpha(150.0, dist);
|
||||
totalAlpha += getColorAlpha(180.0, dist);
|
||||
totalAlpha += getColorAlpha(210.0, dist);
|
||||
totalAlpha += getColorAlpha(240.0, dist);
|
||||
totalAlpha += getColorAlpha(270.0, dist);
|
||||
totalAlpha += getColorAlpha(300.0, dist);
|
||||
totalAlpha += getColorAlpha(330.0, dist);
|
||||
|
||||
return totalAlpha * 0.0833;
|
||||
}
|
||||
|
||||
float getGlowAlpha () {
|
||||
if (glowWidth == 0.0 ) {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
float totalAlpha = 0.0;
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.1);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.2);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.3);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.4);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.5);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.6);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.7);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.8);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 0.9);
|
||||
totalAlpha += getAverageAlpha(glowWidth * 1.0);
|
||||
|
||||
return totalAlpha * 0.1;
|
||||
}
|
||||
|
||||
vec4 frag () {
|
||||
vec4 o = vec4(1, 1, 1, 1);
|
||||
|
||||
#if USE_TEXTURE
|
||||
o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0);
|
||||
#if IS_GRAY
|
||||
float gray = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b;
|
||||
o.r = o.g = o.b = gray;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
float alpha = getGlowAlpha();
|
||||
|
||||
if (alpha <= glowThreshold) {
|
||||
alpha /= glowThreshold;
|
||||
alpha = -1.0 * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) + 1.0;
|
||||
} else {
|
||||
alpha = 0.0;
|
||||
}
|
||||
|
||||
vec4 dstColor = glowColor * alpha;
|
||||
vec4 scrColor = o;
|
||||
|
||||
o = scrColor * scrColor.a + dstColor * (1.0 - scrColor.a);
|
||||
|
||||
o *= color;
|
||||
ALPHA_TEST(o);
|
||||
return o;
|
||||
}
|
||||
}%
|
||||
@@ -1 +0,0 @@
|
||||
{"ver":"1.7.1","importer":"effect","imported":true,"uuid":"40c25c17-db22-4ae7-8d3a-f73cbb6d36ba","files":[".json"],"subMetas":{},"userData":{"combinations":[{}]}}
|
||||
Reference in New Issue
Block a user