fix(hero): 调整英雄升级特效播放逻辑

修正了英雄等级对应的特效播放映射，注释了暂未使用的9级特效代码

assets/resources/game/gui/materials/outline-blue.mtl

@@ -0,0 +1,41 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "64e60a99-c0c5-4e55-bb76-89ab7d9bb1c7",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "USE_TEXTURE": true
+    }
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "glowColor": {
+        "__type__": "cc.Color",
+        "r": 20,
+        "g": 227,
+        "b": 255,
+        "a": 255
+      },
+      "glowWidth": 0.002,
+      "glowThreshold": 0.887
+    }
+  ]
+}

assets/resources/game/gui/materials/outline-blue.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"0f38817f-a8df-4547-8b37-e7ed29de8216","files":[".json"],"subMetas":{},"userData":{}}

assets/resources/game/gui/materials/outline-green.mtl

@@ -0,0 +1,41 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "6ef5f656-8e02-4293-81ad-f621d747205a",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "USE_TEXTURE": true
+    }
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "glowColor": {
+        "__type__": "cc.Color",
+        "r": 105,
+        "g": 255,
+        "b": 20,
+        "a": 255
+      },
+      "glowWidth": 0.002,
+      "glowThreshold": 0.887
+    }
+  ]
+}

assets/resources/game/gui/materials/outline-green.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"ded728b9-6dd0-4c37-9970-9745c62aa8bf","files":[".json"],"subMetas":{},"userData":{}}

assets/resources/game/gui/materials/outline-pur.mtl

@@ -0,0 +1,41 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "22f6acfb-c03d-4213-918a-4d3b0cce76b4",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "USE_TEXTURE": true
+    }
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "glowColor": {
+        "__type__": "cc.Color",
+        "r": 130,
+        "g": 46,
+        "b": 255,
+        "a": 255
+      },
+      "glowWidth": 0.002,
+      "glowThreshold": 0.887
+    }
+  ]
+}

assets/resources/game/gui/materials/outline-pur.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"acf230af-e9ae-42f8-80a1-552d7d10390f","files":[".json"],"subMetas":{},"userData":{}}

assets/resources/game/gui/materials/outline-yellow.mtl

@@ -0,0 +1,41 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "645285fa-29be-4ca6-8f17-05ae82ef4982",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "USE_TEXTURE": true
+    }
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "glowColor": {
+        "__type__": "cc.Color",
+        "r": 247,
+        "g": 255,
+        "b": 46,
+        "a": 255
+      },
+      "glowWidth": 0.002,
+      "glowThreshold": 0.887
+    }
+  ]
+}

assets/resources/game/gui/materials/outline-yellow.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"2b8a37ee-732c-4c5b-b6a4-136f3e581cde","files":[".json"],"subMetas":{},"userData":{}}

assets/resources/game/gui/shaders/builtin-sprite-outline-blue.effect

@@ -0,0 +1,169 @@
+// 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;
+  }
+}%

assets/resources/game/gui/shaders/builtin-sprite-outline-blue.effect.meta

@@ -0,0 +1 @@
+{"ver":"1.7.1","importer":"effect","imported":true,"uuid":"64e60a99-c0c5-4e55-bb76-89ab7d9bb1c7","files":[".json"],"subMetas":{},"userData":{"combinations":[{}]}}

assets/resources/game/gui/shaders/builtin-sprite-outline-green.effect

@@ -0,0 +1,169 @@
+// 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;
+  }
+}%

assets/resources/game/gui/shaders/builtin-sprite-outline-green.effect.meta

@@ -0,0 +1 @@
+{"ver":"1.7.1","importer":"effect","imported":true,"uuid":"6ef5f656-8e02-4293-81ad-f621d747205a","files":[".json"],"subMetas":{},"userData":{"combinations":[{}]}}

assets/resources/game/gui/shaders/builtin-sprite-outline-pur.effect

@@ -0,0 +1,169 @@
+// 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;
+  }
+}%

assets/resources/game/gui/shaders/builtin-sprite-outline-pur.effect.meta

@@ -0,0 +1 @@
+{"ver":"1.7.1","importer":"effect","imported":true,"uuid":"22f6acfb-c03d-4213-918a-4d3b0cce76b4","files":[".json"],"subMetas":{},"userData":{"combinations":[{}]}}

assets/resources/game/gui/shaders/builtin-sprite-outline-yellow.effect

@@ -0,0 +1,169 @@
+// 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;
+  }
+}%

assets/resources/game/gui/shaders/builtin-sprite-outline-yellow.effect.meta

@@ -0,0 +1 @@
+{"ver":"1.7.1","importer":"effect","imported":true,"uuid":"645285fa-29be-4ca6-8f17-05ae82ef4982","files":[".json"],"subMetas":{},"userData":{"combinations":[{}]}}

assets/resources/game/heros/0.prefab

@@ -1,787 +0,0 @@
-[
-  {
-    "__type__": "cc.Prefab",
-    "_name": "0",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_native": "",
-    "data": {
-      "__id__": 1
-    },
-    "optimizationPolicy": 0,
-    "persistent": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "0",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      },
-      {
-        "__id__": 14
-      },
-      {
-        "__id__": 26
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 37
-      },
-      {
-        "__id__": 39
-      },
-      {
-        "__id__": 41
-      },
-      {
-        "__id__": 43
-      },
-      {
-        "__id__": 45
-      }
-    ],
-    "_prefab": {
-      "__id__": 47
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -0.041,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "anm",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      },
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 11
-      }
-    ],
-    "_prefab": {
-      "__id__": 13
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -35.876,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": -0.8,
-      "y": 0.8,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 4
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 192,
-      "height": 192
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9eaEPPEkdKYYfWIxgJ1KbU"
-  },
-  {
-    "__type__": "4ba4awuz8tF34rq4TkZ9W1S",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 6
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "569pdLaDNB6qtHi4mnEa2p"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 8
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@d71e7",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": {
-      "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5",
-      "__expectedType__": "cc.SpriteAtlas"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "aapdDlt5hKmZ6bjST88uia"
-  },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "c5ffa9f7-44e4-41b9-a927-f4856f5328f4",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "8f109f2d-d5fc-4f3f-8897-d4c4b5fabf68",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "2d545a13-b7b3-4a3d-b351-08937caafd96",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "97ca2809-a0c4-48e3-9249-d2036d7470ae",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "85922420-4b73-4fcc-bf19-11f39c582ac3",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "406uXfKLJEbab+NVEqD1aS"
-  },
-  {
-    "__type__": "954e43Y+QJHNIUpmqTCWA7A",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 12
-    },
-    "hitFlashMaterial": {
-      "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
-      "__expectedType__": "cc.Material"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b4+2TVK9JC7p5lhflMVjuO"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "4aKyovCOhDJpr23Of35+5a",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 15
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 14
-    },
-    "asset": {
-      "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
-    "instance": {
-      "__id__": 16
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "3a1pwLAh1NkYnlDVrAFcnS",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 17
-      },
-      {
-        "__id__": 19
-      },
-      {
-        "__id__": 20
-      },
-      {
-        "__id__": 21
-      },
-      {
-        "__id__": 22
-      },
-      {
-        "__id__": 23
-      },
-      {
-        "__id__": 25
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 18
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "shielded"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "c46/YsCPVOJYA4mWEpNYRx"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 18
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 18
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 18
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 18
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": false
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 24
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 120,
-      "height": 100
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "63NP9yq3hEUKD/OZZZ5t7x"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 18
-    },
-    "propertyPath": [
-      "_lscale"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 1.3,
-      "y": 1.3,
-      "z": 1
-    }
-  },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 27
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 26
-    },
-    "asset": {
-      "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "5fqU0L3/FOhKaco5UkHuWT",
-    "instance": {
-      "__id__": 28
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "69IAw7dThHvIlVtTfXOVMZ",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 29
-      },
-      {
-        "__id__": 31
-      },
-      {
-        "__id__": 32
-      },
-      {
-        "__id__": 33
-      },
-      {
-        "__id__": 34
-      },
-      {
-        "__id__": 36
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 30
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "top"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "5fqU0L3/FOhKaco5UkHuWT"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 30
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 110.506,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 30
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 30
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 35
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 10.531,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "16MuhUBUpB2ZdBTYflEf1n"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 30
-    },
-    "propertyPath": [
-      "_lscale"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0.7,
-      "y": 0.7,
-      "z": 1
-    }
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 38
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 80,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "14OhXRCixNOaApgow/hFbp"
-  },
-  {
-    "__type__": "a0379fmhvBHcbNcBF/l43O8",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 40
-    },
-    "anm": {
-      "__id__": 5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "73PcRpG0xKxJpIRC2zbI/o"
-  },
-  {
-    "__type__": "873f8d+SolMEo8DiTTxZRh4",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 42
-    },
-    "debugMode": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "cc.RigidBody2D",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 44
-    },
-    "enabledContactListener": true,
-    "bullet": false,
-    "awakeOnLoad": true,
-    "_group": 4,
-    "_type": 1,
-    "_allowSleep": false,
-    "_gravityScale": 1,
-    "_linearDamping": 0,
-    "_angularDamping": 0,
-    "_linearVelocity": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_angularVelocity": 0,
-    "_fixedRotation": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a5vv6W0YtAmJB1hZwCBALm"
-  },
-  {
-    "__type__": "cc.BoxCollider2D",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 46
-    },
-    "tag": 0,
-    "_group": 4,
-    "_density": 1,
-    "_sensor": true,
-    "_friction": 0.2,
-    "_restitution": 0,
-    "_offset": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 50
-    },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 30,
-      "height": 100
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "23j+p5lLdC+r4iKSVeLNM4"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "fdklpBwCBM/qJ4WFlQF3kT",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 26
-      },
-      {
-        "__id__": 14
-      }
-    ]
-  }
-]

assets/resources/game/heros/ha1.prefab

@@ -209,7 +209,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e3af9",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@85704",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -225,7 +225,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": {
-      "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05",
       "__expectedType__": "cc.SpriteAtlas"
     },
     "_id": ""
@@ -292,6 +292,22 @@
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
       "__expectedType__": "cc.Material"
     },
+    "outlineMatGreen": {
+      "__uuid__": "ded728b9-6dd0-4c37-9970-9745c62aa8bf",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatBlue": {
+      "__uuid__": "0f38817f-a8df-4547-8b37-e7ed29de8216",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatPurple": {
+      "__uuid__": "acf230af-e9ae-42f8-80a1-552d7d10390f",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatYellow": {
+      "__uuid__": "2b8a37ee-732c-4c5b-b6a4-136f3e581cde",
+      "__expectedType__": "cc.Material"
+    },
     "_id": ""
   },
   {

assets/resources/game/heros/ha2.prefab

@@ -114,7 +114,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -24.925,
+      "y": -25,
       "z": 0
     },
     "_lrot": {
@@ -209,7 +209,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@1e4e3",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4fb61",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -225,7 +225,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": {
-      "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05",
       "__expectedType__": "cc.SpriteAtlas"
     },
     "_id": ""
@@ -234,48 +234,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "aapdDlt5hKmZ6bjST88uia"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "27842cf4-9691-47b9-ae2f-a2d75599eb20",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "0917b75e-39ac-489a-ade3-a971011e4e0a",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "222a8903-2dee-4bf6-b6eb-72fd1541609b",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "a8ecc076-98b4-45c6-99e1-ab67992682fa",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "04b4ebf7-303b-495f-a3e9-640831dbb353",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "406uXfKLJEbab+NVEqD1aS"
-  },
   {
     "__type__": "954e43Y+QJHNIUpmqTCWA7A",
     "_name": "",
@@ -286,18 +244,76 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 10
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
       "__expectedType__": "cc.Material"
     },
+    "outlineMatGreen": {
+      "__uuid__": "ded728b9-6dd0-4c37-9970-9745c62aa8bf",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatBlue": {
+      "__uuid__": "0f38817f-a8df-4547-8b37-e7ed29de8216",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatPurple": {
+      "__uuid__": "acf230af-e9ae-42f8-80a1-552d7d10390f",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatYellow": {
+      "__uuid__": "2b8a37ee-732c-4c5b-b6a4-136f3e581cde",
+      "__expectedType__": "cc.Material"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
     "fileId": "f9iLivg4dHhJksWCjvY9/w"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "cd3e0604-8840-4794-8755-f2ed86dbe264",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "5d85a577-a49f-4ddc-a7b7-12a2721081d3",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "774fcb32-b38f-4a74-a602-07b6115e8d64",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "a6bf4efc-ad53-4f37-b972-8fd0eb7f2ee6",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "6e473d77-a270-42c3-adc7-c675666f280d",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c5R7E6LWdMNYjjgZNJ+x0G"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -560,7 +576,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 90.171,
+      "y": 80,
       "z": 0
     }
   },
@@ -780,7 +796,12 @@
       "__id__": 48
     },
     "playOnLoad": false,
-    "_clips": [],
+    "_clips": [
+      {
+        "__uuid__": "cd3e0604-8840-4794-8755-f2ed86dbe264",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
     "_defaultClip": null,
     "_id": ""
   },

assets/resources/game/heros/ha2.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "93ae1893-59bb-4792-8034-95104f446a4e",
+  "uuid": "2266c9e2-b1b7-4de7-9d45-b1f6e2ceb4d8",
   "files": [
     ".json"
   ],

assets/resources/game/heros/ha3.prefab

@@ -209,7 +209,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@7d01e",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1d762",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -225,7 +225,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": {
-      "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05",
       "__expectedType__": "cc.SpriteAtlas"
     },
     "_id": ""
@@ -234,48 +234,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "aapdDlt5hKmZ6bjST88uia"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "b277aa55-1679-493f-8e83-dcda712bb82d",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "a8017a4f-e079-4b37-b0ce-647a5c68e11a",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "c4f77aa9-cf65-4577-96eb-50fcb7b9ed72",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "b5e9db6a-bad1-45a4-a01a-06c81519aab9",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "70d98337-6518-4d2f-a45e-6e7e6b3fd20c",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "406uXfKLJEbab+NVEqD1aS"
-  },
   {
     "__type__": "954e43Y+QJHNIUpmqTCWA7A",
     "_name": "",
@@ -286,18 +244,79 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 10
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
       "__expectedType__": "cc.Material"
     },
+    "outlineMatGreen": {
+      "__uuid__": "ded728b9-6dd0-4c37-9970-9745c62aa8bf",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatBlue": {
+      "__uuid__": "0f38817f-a8df-4547-8b37-e7ed29de8216",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatPurple": {
+      "__uuid__": "acf230af-e9ae-42f8-80a1-552d7d10390f",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatYellow": {
+      "__uuid__": "2b8a37ee-732c-4c5b-b6a4-136f3e581cde",
+      "__expectedType__": "cc.Material"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
     "fileId": "f9iLivg4dHhJksWCjvY9/w"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "74e35021-ee4c-4ece-b56c-2b05ea5fb030",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "2fcf90db-b183-4351-a01f-97f674a2d5e8",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "1110692e-6a26-4b5d-9ced-74990a5d6151",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "179d8551-31f3-43a9-a55d-1dd1bf0a48c6",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "574966fb-4a2d-4f05-ab7c-b7603d6cfce2",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "74e35021-ee4c-4ece-b56c-2b05ea5fb030",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "06EKbjjoxNH7Ap9yy21xqN"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -560,7 +579,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 90.171,
+      "y": 80,
       "z": 0
     }
   },

assets/resources/game/heros/ha3.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "9a1cd30e-f87a-4ab5-9749-d0e2db55545c",
+  "uuid": "eb31f412-5260-4e30-b15b-959914056f7a",
   "files": [
     ".json"
   ],

assets/resources/game/heros/ha4.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "hz1",
+    "_name": "ha4",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "hz1",
+    "_name": "ha4",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -44,10 +44,13 @@
       },
       {
         "__id__": 45
+      },
+      {
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -206,7 +209,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@2f975",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e6c6a",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -222,7 +225,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": {
-      "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257",
+      "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05",
       "__expectedType__": "cc.SpriteAtlas"
     },
     "_id": ""
@@ -231,48 +234,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "aapdDlt5hKmZ6bjST88uia"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "6584970d-6f08-4a6d-841c-ad607fdb5ba4",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "f1de4092-7e1d-4cce-862a-153a40ed5d65",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "fd55f78d-9794-461d-bdd7-32ed7eaad92e",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "b44da24e-66e0-4635-ad32-573a72f4796d",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "b10e5ef0-6f07-4cd9-97d6-1a9ce6e17e4c",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "406uXfKLJEbab+NVEqD1aS"
-  },
   {
     "__type__": "954e43Y+QJHNIUpmqTCWA7A",
     "_name": "",
@@ -283,17 +244,75 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 10
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
       "__expectedType__": "cc.Material"
     },
+    "outlineMatGreen": {
+      "__uuid__": "ded728b9-6dd0-4c37-9970-9745c62aa8bf",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatBlue": {
+      "__uuid__": "0f38817f-a8df-4547-8b37-e7ed29de8216",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatPurple": {
+      "__uuid__": "acf230af-e9ae-42f8-80a1-552d7d10390f",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatYellow": {
+      "__uuid__": "2b8a37ee-732c-4c5b-b6a4-136f3e581cde",
+      "__expectedType__": "cc.Material"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "71mx/IdRVDz5H8mz6V7BsE"
+    "fileId": "f9iLivg4dHhJksWCjvY9/w"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "1f1bb53e-091b-46a6-b5f8-cf6b5337adcf",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "80fd4adf-5192-43fe-8eb1-250b9b95eda6",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "6911cab0-fbaa-4d7c-ba55-179d521c67c8",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "5d9dc8c2-a688-48c8-85a5-9edd8401b3a6",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "4665ac1c-4f18-44e8-a4d1-6716bf68da11",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "31Ly084eZNZJBKbriZpwZP"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -557,7 +576,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 102.744,
+      "y": 80,
       "z": 0
     }
   },
@@ -764,6 +783,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 48
+    },
+    "playOnLoad": false,
+    "_clips": [],
+    "_defaultClip": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "49+IQe4gZPPYzJ/FgxeX/O"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/resources/game/heros/ha4.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "9c11361f-7e7f-4686-a8f7-07b9b96d35a5",
+  "uuid": "9895aa95-2d19-4a18-8c9b-00d9500f273a",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "hm6"
+    "syncNodeName": "ha4"
   }
 }

assets/resources/game/heros/hc1.prefab

@@ -44,10 +44,13 @@
       },
       {
         "__id__": 45
+      },
+      {
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -206,7 +209,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@14e00",
+      "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@14e00",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -222,7 +225,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": {
-      "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269",
+      "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d",
       "__expectedType__": "cc.SpriteAtlas"
     },
     "_id": ""
@@ -231,48 +234,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "aapdDlt5hKmZ6bjST88uia"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "c7a0ded9-a870-4fc4-93e2-1bec11801142",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "9098ce69-33e0-41d6-ab79-274accd1fa56",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "fbf32dae-f240-47a6-9aa5-b4f8b01a87af",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "56628bc8-a6c1-4c3d-8326-8a28b03af883",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "5390adef-a142-406a-9324-2fa2baefd64e",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "406uXfKLJEbab+NVEqD1aS"
-  },
   {
     "__type__": "954e43Y+QJHNIUpmqTCWA7A",
     "_name": "",
@@ -283,17 +244,75 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 10
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
       "__expectedType__": "cc.Material"
     },
+    "outlineMatGreen": {
+      "__uuid__": "ded728b9-6dd0-4c37-9970-9745c62aa8bf",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatBlue": {
+      "__uuid__": "0f38817f-a8df-4547-8b37-e7ed29de8216",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatPurple": {
+      "__uuid__": "acf230af-e9ae-42f8-80a1-552d7d10390f",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatYellow": {
+      "__uuid__": "2b8a37ee-732c-4c5b-b6a4-136f3e581cde",
+      "__expectedType__": "cc.Material"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6cZu2rl69OR5+l1nRZerhd"
+    "fileId": "f9iLivg4dHhJksWCjvY9/w"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "d795f0b0-cd12-43db-bc47-79dddf1d7528",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "fed4df36-6a3f-4a12-a6e5-2a5ad140efbf",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "2d5be258-449e-43a6-bf51-11e7cbf7ce0a",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "69f355b0-4430-4b47-9784-545110b51829",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "034e64ba-3ad5-4f85-94e7-315de6a7f508",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7eUuagZhNEMq55Rlf93k+e"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -557,7 +576,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 87.191,
+      "y": 80,
       "z": 0
     }
   },
@@ -764,6 +783,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 48
+    },
+    "playOnLoad": false,
+    "_clips": [],
+    "_defaultClip": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "49+IQe4gZPPYzJ/FgxeX/O"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/resources/game/heros/hc1.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "dcdb138c-1ca1-4ff2-85f7-eff1225fae08",
+  "uuid": "2d428d8f-7fe9-458c-90f8-6d276e2ba9d4",
   "files": [
     ".json"
   ],

assets/resources/game/heros/hc2.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "hm6",
+    "_name": "hc2",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "hm6",
+    "_name": "hc2",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -44,10 +44,13 @@
       },
       {
         "__id__": 45
+      },
+      {
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -206,7 +209,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@cca32",
+      "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@28c51",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -222,7 +225,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": {
-      "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5",
+      "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d",
       "__expectedType__": "cc.SpriteAtlas"
     },
     "_id": ""
@@ -231,48 +234,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "aapdDlt5hKmZ6bjST88uia"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "3335957a-6ba6-4c04-8c6e-c392f64ae47d",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "3f7337c1-7574-4c27-b9d9-fad58df5d9a8",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "2a42adaa-a86c-4271-86ff-b21bbf570f06",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "af17361f-b4d8-47b6-8786-3fafc3be53f9",
-        "__expectedType__": "cc.AnimationClip"
-      },
-      {
-        "__uuid__": "6f9bc36a-e805-4bda-92b1-9d46e119e17a",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "406uXfKLJEbab+NVEqD1aS"
-  },
   {
     "__type__": "954e43Y+QJHNIUpmqTCWA7A",
     "_name": "",
@@ -283,17 +244,75 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 10
     },
     "hitFlashMaterial": {
       "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
       "__expectedType__": "cc.Material"
     },
+    "outlineMatGreen": {
+      "__uuid__": "ded728b9-6dd0-4c37-9970-9745c62aa8bf",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatBlue": {
+      "__uuid__": "0f38817f-a8df-4547-8b37-e7ed29de8216",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatPurple": {
+      "__uuid__": "acf230af-e9ae-42f8-80a1-552d7d10390f",
+      "__expectedType__": "cc.Material"
+    },
+    "outlineMatYellow": {
+      "__uuid__": "2b8a37ee-732c-4c5b-b6a4-136f3e581cde",
+      "__expectedType__": "cc.Material"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b4+2TVK9JC7p5lhflMVjuO"
+    "fileId": "f9iLivg4dHhJksWCjvY9/w"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "83e8b59a-9b9c-41d1-b039-123d8ee3c2ca",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "565db9a3-5c7c-4936-85d2-fefc87086597",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "63385316-79d3-4237-a421-10504927ff71",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "270a74c7-b521-4688-9627-7618cee322c7",
+        "__expectedType__": "cc.AnimationClip"
+      },
+      {
+        "__uuid__": "c075034e-2f66-4fc1-8607-90c16fca23f7",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d9wky9J+VJKrB9kRloK1Zs"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -557,7 +576,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 110.506,
+      "y": 80,
       "z": 0
     }
   },
@@ -764,6 +783,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 48
+    },
+    "playOnLoad": false,
+    "_clips": [],
+    "_defaultClip": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "49+IQe4gZPPYzJ/FgxeX/O"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/resources/game/heros/hc2.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "48b244c4-b15f-4c6c-b468-c6b44aae439a",
+  "uuid": "63a1e418-f8a5-4ad5-87e7-18672a3260c9",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "0"
+    "syncNodeName": "hc2"
   }
 }

assets/resources/game/heros/hero/a1234.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "19d24e7b-440b-46b5-8f05-c3090661d736",
+  "uuid": "f715eece-d5c2-4813-9f80-2cda39c3a706",
   "files": [
     ".json",
     ".png"
@@ -10,8 +10,8 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "19d24e7b-440b-46b5-8f05-c3090661d736@6c48a",
+      "uuid": "f715eece-d5c2-4813-9f80-2cda39c3a706@6c48a",
-      "displayName": "be123",
+      "displayName": "a1234",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -22,7 +22,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "19d24e7b-440b-46b5-8f05-c3090661d736",
+        "imageUuidOrDatabaseUri": "f715eece-d5c2-4813-9f80-2cda39c3a706",
         "visible": false
       },
       "ver": "1.0.22",
@@ -37,6 +37,6 @@
     "type": "texture",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "19d24e7b-440b-46b5-8f05-c3090661d736@6c48a"
+    "redirect": "f715eece-d5c2-4813-9f80-2cda39c3a706@6c48a"
   }
 }

assets/resources/game/heros/hero/c12h12.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "aa5e5be6-1b46-4849-af44-38d6187291a2",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "aa5e5be6-1b46-4849-af44-38d6187291a2@6c48a",
+      "displayName": "c12h12",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "aa5e5be6-1b46-4849-af44-38d6187291a2",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "texture",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "aa5e5be6-1b46-4849-af44-38d6187291a2@6c48a"
+  }
+}

assets/resources/game/heros/hero/ha1/atk0.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.6666666666666666,
+    "_duration": 0.5333333333333333,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -76,91 +76,71 @@
       0.4,
       0.43333333333333335,
       0.4666666666666667,
-      0.5,
+      0.5
-      0.5333333333333333,
-      0.5666666666666667,
-      0.6,
-      0.6333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e9205",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@cea12",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@35cb3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@0b41a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@20d4b",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@418e0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0f1aa",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@21d56",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cbd6c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@8aa15",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@d6f67",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@98a04",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@993b3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ab77c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f23a3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3c145",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85956",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@9cdac",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e66fc",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@23fda",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0b4f6",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f4d14",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ec4aa",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1b9a8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@64b4c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@800f0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@14bf2",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@19235",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@24319",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@345a2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@64c77",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d911c",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@faf01",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a02f7",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@52c3b",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c2676",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha1/idle.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.6,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,58 +69,43 @@
       0.3333333333333333,
       0.4,
       0.4666666666666667,
-      0.5333333333333333,
+      0.5333333333333333
-      0.6,
-      0.6666666666666666,
-      0.7333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@85704",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@35219",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@35219",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@d748d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d748d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@92027",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@92027",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@4d3d4",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4d3d4",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@18367",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@18367",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@295fd",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@295fd",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7bb9f",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@7bb9f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@5cd54",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5cd54",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6628e",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f7922",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@73b30",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha1/max0.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.45,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,78 +69,43 @@
       0.25,
       0.3,
       0.35,
-      0.4,
+      0.4
-      0.45,
-      0.5,
-      0.55,
-      0.6,
-      0.65,
-      0.7,
-      0.75
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e3af9",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@46381",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@5cb03",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e9823",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@78df0",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@40049",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7b3fb",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@598fa",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0741b",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@2ac56",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@27b3e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5328c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a84bd",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@164e0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@b1f80",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@02442",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e7fd0",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d5f9e",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ea280",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@4bbc6",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f6cab",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f1a00",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@2f215",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a8e72",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f742c",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha1/max1.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.43333333333333335,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -73,74 +73,59 @@
       0.3,
       0.3333333333333333,
       0.36666666666666664,
-      0.4,
+      0.4
-      0.43333333333333335,
-      0.4666666666666667,
-      0.5
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a2ae4",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5a47e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@4d9fe",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f26c6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@93628",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@761bc",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6d64b",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@70ef7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@849c2",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@dddeb",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@98343",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@2b5f0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7dc3d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@94bad",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@761d4",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@850d9",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@05c47",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e79b7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ecc1a",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@2cd62",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@adbb1",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4abe8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ddcc8",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f51f4",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@8dde2",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@48a32",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@97161",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@10581",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@9c742",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha1/move.anim

@@ -7,11 +7,11 @@
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 15,
+    "sample": 12,
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.5,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,45 +62,35 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.06666666666666667,
+      0.08333333333333333,
-      0.13333333333333333,
+      0.16666666666666666,
-      0.2,
+      0.25,
-      0.26666666666666666,
       0.3333333333333333,
-      0.4,
+      0.4166666666666667
-      0.4666666666666667
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@86ff6",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@28ccb",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ef970",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5c1ba",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@68ab0",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@bca30",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@8d02d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@6d60e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cf58c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e67ee",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@9a164",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f11ef",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@2fa19",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@3b56d",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha2.meta

@@ -1 +1 @@
-{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"97e6ae27-9f43-4343-8801-ecdfd49cd39e","files":[],"subMetas":{},"userData":{}}
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"89017205-6a1d-4903-936f-c405888094bd","files":[],"subMetas":{},"userData":{}}

assets/resources/game/heros/hero/ha2/atk0.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.6666666666666666,
+    "_duration": 0.5333333333333333,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -76,91 +76,71 @@
       0.4,
       0.43333333333333335,
       0.4666666666666667,
-      0.5,
+      0.5
-      0.5333333333333333,
-      0.5666666666666667,
-      0.6,
-      0.6333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ac518",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e0a5b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c6f18",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@62e7f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@01a40",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e0882",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e12b7",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e53d6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@1bfe6",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@0803a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@b0dc3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@c891e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0c2da",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@01ec2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0188e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ffb04",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@1cefc",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@6a4f9",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@065ff",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@9e70e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c16e3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@73592",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@2238e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@95945",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@d48b4",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@920c0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e81e5",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@8f845",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@8198a",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@81ade",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@73703",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4d224",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@b3b01",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c9814",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7043f",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@64af7",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha2/atk0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"27842cf4-9691-47b9-ae2f-a2d75599eb20","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"cd3e0604-8840-4794-8755-f2ed86dbe264","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}

assets/resources/game/heros/hero/ha2/idle.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.6,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,58 +69,43 @@
       0.3333333333333333,
       0.4,
       0.4666666666666667,
-      0.5333333333333333,
+      0.5333333333333333
-      0.6,
-      0.6666666666666666,
-      0.7333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@1e4e3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4fb61",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@b7722",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3e6c5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@03c0e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4932f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@37ecb",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@13597",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e4794",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@be134",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c3a10",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@6dffd",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@33928",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e8c23",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@00407",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4fa63",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@83060",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@b0402",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@dac07",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f4bc5",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@2d6fa",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha2/idle.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"0917b75e-39ac-489a-ade3-a971011e4e0a","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"5d85a577-a49f-4ddc-a7b7-12a2721081d3","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}

assets/resources/game/heros/hero/ha2/max0.anim

@@ -7,11 +7,11 @@
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 24,
+    "sample": 20,
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.6666666666666666,
+    "_duration": 0.45,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,85 +62,50 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.041666666666666664,
+      0.05,
-      0.08333333333333333,
+      0.1,
-      0.125,
+      0.15,
-      0.16666666666666666,
+      0.2,
-      0.20833333333333334,
       0.25,
-      0.2916666666666667,
+      0.3,
-      0.3333333333333333,
+      0.35,
-      0.375,
+      0.4
-      0.4166666666666667,
-      0.4583333333333333,
-      0.5,
-      0.5416666666666666,
-      0.5833333333333334,
-      0.625
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@2c738",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a7cad",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@b12ff",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@081ac",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a3132",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@8fc27",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e6ca6",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@90810",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@5ca04",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@94f5e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@62e36",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@bc38a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@220b1",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@76fc6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@40cce",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d2151",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cf92d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@08d14",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ea86e",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@fb48a",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@39404",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@4b75c",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@9e071",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a741e",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@49ba2",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha2/max0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"222a8903-2dee-4bf6-b6eb-72fd1541609b","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"774fcb32-b38f-4a74-a602-07b6115e8d64","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}

assets/resources/game/heros/hero/ha2/max1.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.43333333333333335,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -73,74 +73,59 @@
       0.3,
       0.3333333333333333,
       0.36666666666666664,
-      0.4,
+      0.4
-      0.43333333333333335,
-      0.4666666666666667,
-      0.5
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f5571",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@29293",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ae255",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4f9cd",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6f886",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@93898",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@667c4",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@9732d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6bb3f",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@b2cd5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@73c9c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@7e86e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@8cd43",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@b58b4",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ecebe",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@165f7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@10a88",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@08770",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@3c8b8",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@6ff7e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@3e046",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e143d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@59bf8",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ff726",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@47aa2",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5f6f4",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c3781",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@4c3ba",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@60710",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha2/max1.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"a8ecc076-98b4-45c6-99e1-ab67992682fa","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"a6bf4efc-ad53-4f37-b972-8fd0eb7f2ee6","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}

assets/resources/game/heros/hero/ha2/move.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.4,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -66,41 +66,31 @@
       0.13333333333333333,
       0.2,
       0.26666666666666666,
-      0.3333333333333333,
+      0.3333333333333333
-      0.4,
-      0.4666666666666667
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7b1f5",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@378ca",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cf210",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ee1a2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a5c45",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@8d3f0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@5c218",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@98226",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@bbab0",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a44ec",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@b1844",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@775aa",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@9b1f5",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c721c",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha2/move.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"04b4ebf7-303b-495f-a3e9-640831dbb353","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"6e473d77-a270-42c3-adc7-c675666f280d","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}

assets/resources/game/heros/hero/ha3.meta

@@ -1 +1 @@
-{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"a6fcca3b-9137-4073-b74a-bdfa6a707593","files":[],"subMetas":{},"userData":{}}
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"633e4cde-ab87-41ca-b2f3-729d8c5846e2","files":[],"subMetas":{},"userData":{}}

assets/resources/game/heros/hero/ha3/atk0.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.6666666666666666,
+    "_duration": 0.5333333333333333,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -76,91 +76,71 @@
       0.4,
       0.43333333333333335,
       0.4666666666666667,
-      0.5,
+      0.5
-      0.5333333333333333,
-      0.5666666666666667,
-      0.6,
-      0.6333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@57040",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1d762",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@e5f42",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a5f7c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@470a7",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@610d9",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@61856",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e385a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@29039",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@bd1ab",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@d340e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5670e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@427f4",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@0a55a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@6d818",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@88d75",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@fe8d1",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@0d6fb",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@58ba7",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@69473",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@456ce",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@8f05c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@9bbc8",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@bae36",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@de758",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@741b3",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@38210",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@7eca1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@2ea37",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d45dc",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@bcfae",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@72cc4",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@38bd1",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@be458",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@79fcc",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@b4692",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha3/atk0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"b277aa55-1679-493f-8e83-dcda712bb82d","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"574966fb-4a2d-4f05-ab7c-b7603d6cfce2","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}

assets/resources/game/heros/hero/ha3/idle.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.6,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,58 +69,43 @@
       0.3333333333333333,
       0.4,
       0.4666666666666667,
-      0.5333333333333333,
+      0.5333333333333333
-      0.6,
-      0.6666666666666666,
-      0.7333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@7d01e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@b7500",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@82741",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@799c1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@51359",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@89b44",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@84421",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@204c2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@f11d1",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ef8a1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@8329e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5e04f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@c3865",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@c6568",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@52c75",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e6c21",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@271e3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a2556",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@ba0e0",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@c480a",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@71e25",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha3/idle.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"a8017a4f-e079-4b37-b0ce-647a5c68e11a","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"179d8551-31f3-43a9-a55d-1dd1bf0a48c6","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}

assets/resources/game/heros/hero/ha3/max0.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.45,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,78 +69,43 @@
       0.25,
       0.3,
       0.35,
-      0.4,
+      0.4
-      0.45,
-      0.5,
-      0.55,
-      0.6,
-      0.65,
-      0.7,
-      0.75
     ],
     "_values": [
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@febca",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@2c1ea",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@faba7",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e3719",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@dbe54",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@417f7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@afb16",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1bdaa",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@f5238",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@2c8e7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@5bee7",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@36b73",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@06414",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@fde92",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@04443",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3d326",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@b2f8b",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@aac63",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@3c3d1",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@ce34d",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@15051",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@571ae",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@5c2e4",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@078fc",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@8c7e8",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha3/max0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"c4f77aa9-cf65-4577-96eb-50fcb7b9ed72","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"1110692e-6a26-4b5d-9ced-74990a5d6151","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}

assets/resources/game/heros/hero/ha3/max1.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.43333333333333335,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -73,74 +73,59 @@
       0.3,
       0.3333333333333333,
       0.36666666666666664,
-      0.4,
+      0.4
-      0.43333333333333335,
-      0.4666666666666667,
-      0.5
     ],
     "_values": [
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@87623",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a7a2d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@9d68d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e838b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@ff087",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@c02b4",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@a32d5",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@294f8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@61087",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e2bdd",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@82719",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@c9436",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@70530",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@786b6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@7a7e5",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e265c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@9756b",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3ec3d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@4647d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@bbd0f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@a9093",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d8a81",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@15d31",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ca166",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@d1072",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1909c",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@b65f5",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@119da",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@0c4b3",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha3/max1.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"b5e9db6a-bad1-45a4-a01a-06c81519aab9","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"2fcf90db-b183-4351-a01f-97f674a2d5e8","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}

assets/resources/game/heros/hero/ha3/move.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.4,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -66,41 +66,31 @@
       0.13333333333333333,
       0.2,
       0.26666666666666666,
-      0.3333333333333333,
+      0.3333333333333333
-      0.4,
-      0.4666666666666667
     ],
     "_values": [
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@c25f8",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@6dcbf",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@b0b5e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@9592c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@eadff",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@8b83b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@76880",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@84bee",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@8563d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@b64af",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@1703c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a831a",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@53293",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fa25ac4e-a686-4a67-a392-d88e1cc4468b@c3736",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha3/move.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"70d98337-6518-4d2f-a45e-6e7e6b3fd20c","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"74e35021-ee4c-4ece-b56c-2b05ea5fb030","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}

assets/resources/game/heros/hero/ha4.meta

@@ -0,0 +1 @@
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"c0d039ce-1001-4764-a679-48254b94b223","files":[],"subMetas":{},"userData":{}}

assets/resources/game/heros/hero/ha4/atk0.anim

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "dead",
+    "_name": "atk0",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
@@ -80,67 +80,67 @@
     ],
     "_values": [
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@44266",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@00f58",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@90c1e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f0318",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@0a750",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@4754b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@02e74",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@684f7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@0fe6c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e5724",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@b0548",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f13dc",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@c3c78",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e4691",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@0fd50",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d1dcb",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@3cfe3",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@9974c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@567fb",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@dc2f1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@34982",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ee8ec",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@9e13d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3739f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@621c1",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ee8b7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@aeca0",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@900b7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@47c5c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@c7ee2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@4e949",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@41f25",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha4/atk0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"244b437a-7625-48e6-9377-7bb63b784dcc","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"1f1bb53e-091b-46a6-b5f8-cf6b5337adcf","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}

assets/resources/game/heros/hero/ha4/idle.anim

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "move",
+    "_name": "idle",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.6,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -68,39 +68,44 @@
       0.26666666666666666,
       0.3333333333333333,
       0.4,
-      0.4666666666666667
+      0.4666666666666667,
+      0.5333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@a7674",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e6c6a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@dcd40",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@31af0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@60cab",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1ed0c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@c76e2",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@cdaea",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@297e1",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a5abd",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@77c35",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@88e30",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@ff8cf",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@cb273",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@5d540",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d919d",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@43074",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha4/idle.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"2047567e-307a-4c8b-b179-32e340691361","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"80fd4adf-5192-43fe-8eb1-250b9b95eda6","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}

assets/resources/game/heros/hero/ha4/max0.anim

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "atk0",
+    "_name": "max0",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5,
+    "_duration": 0.45,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,48 +69,43 @@
       0.25,
       0.3,
       0.35,
-      0.4,
+      0.4
-      0.45
     ],
     "_values": [
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@42162",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@2f696",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@4122a",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3d82f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@fcd77",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@ef386",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@1471b",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@7979e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@7d4f7",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3a151",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@86507",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@63241",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@905e0",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f8b16",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@99f97",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@c8b5f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@45703",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d7748",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@ab6a0",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha4/max0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"2a42adaa-a86c-4271-86ff-b21bbf570f06","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"6911cab0-fbaa-4d7c-ba55-179d521c67c8","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}

assets/resources/game/heros/hero/ha4/max1.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "idle",
+    "_name": "max1",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 15,
+    "sample": 30,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.43333333333333335,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,65 +62,70 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
+      0.03333333333333333,
       0.06666666666666667,
+      0.1,
       0.13333333333333333,
+      0.16666666666666666,
       0.2,
+      0.23333333333333334,
       0.26666666666666666,
+      0.3,
       0.3333333333333333,
-      0.4,
+      0.36666666666666664,
-      0.4666666666666667,
+      0.4
-      0.5333333333333333,
-      0.6,
-      0.6666666666666666,
-      0.7333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@f081b",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@7b3f5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@af58f",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@cb3ad",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@8ad0e",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@3ae4c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@2ec27",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@5534d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@d7e8f",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@7f70f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@801a5",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@63eb3",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@29702",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1095e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@f4669",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@d129e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@aac70",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@1a870",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@cdd2c",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@84dff",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@8b82d",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@2ebde",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@a1296",
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@bc6e1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@8c1a1",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/ha4/max1.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"af17361f-b4d8-47b6-8786-3fafc3be53f9","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"5d9dc8c2-a688-48c8-85a5-9edd8401b3a6","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}

assets/resources/game/heros/hero/ha4/move.anim

@@ -0,0 +1,103 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "move",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 15,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.4,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 6
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.06666666666666667,
+      0.13333333333333333,
+      0.2,
+      0.26666666666666666,
+      0.3333333333333333
+    ],
+    "_values": [
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@7c477",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@15159",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@220eb",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@feb53",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@f2a40",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@a3a51",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/heros/hero/ha4/move.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"6f9bc36a-e805-4bda-92b1-9d46e119e17a","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"4665ac1c-4f18-44e8-a4d1-6716bf68da11","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}

assets/resources/game/heros/hero/hc1.meta

@@ -1 +1 @@
-{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"23745e1e-bf2b-4d9f-a9d4-3319b0d8f9bc","files":[],"subMetas":{},"userData":{}}
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"fe03c008-45b6-4b21-a414-3e53f77cd1eb","files":[],"subMetas":{},"userData":{}}

assets/resources/game/heros/hero/hc1/atk0.anim

@@ -7,11 +7,11 @@
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 20,
+    "sample": 30,
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5,
+    "_duration": 0.26666666666666666,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,55 +62,45 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.05,
+      0.03333333333333333,
+      0.06666666666666667,
       0.1,
-      0.15,
+      0.13333333333333333,
+      0.16666666666666666,
       0.2,
-      0.25,
+      0.23333333333333334
-      0.3,
-      0.35,
-      0.4,
-      0.45
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@9d33b",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@3288d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@05d15",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@c7b8b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@88fc8",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@3d215",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@96402",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@cc3d6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@bce04",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@c53b6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@84181",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@8ea02",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@02d80",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@6a172",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0531c",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@65eee",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0e1e6",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@93ee2",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/hc1/atk0.anim.meta

@@ -1,13 +1 @@
-{
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"d795f0b0-cd12-43db-bc47-79dddf1d7528","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "c7a0ded9-a870-4fc4-93e2-1bec11801142",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "atk0"
-  }
-}

assets/resources/game/heros/hero/hc1/idle.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.6,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,58 +69,43 @@
       0.3333333333333333,
       0.4,
       0.4666666666666667,
-      0.5333333333333333,
+      0.5333333333333333
-      0.6,
-      0.6666666666666666,
-      0.7333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@14e00",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@14e00",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@52cd6",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@52cd6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@d8da8",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@d8da8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@8edd3",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@8edd3",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@1a65e",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@1a65e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a81aa",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@a81aa",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@dfcd0",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@dfcd0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@72c5c",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@72c5c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@49f37",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@49f37",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cbe0f",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@140ce",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@67242",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/hc1/idle.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"9098ce69-33e0-41d6-ab79-274accd1fa56","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"fed4df36-6a3f-4a12-a6e5-2a5ad140efbf","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}

assets/resources/game/heros/hero/hc1/max0.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.6,
+    "_duration": 0.45,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,58 +69,43 @@
       0.25,
       0.3,
       0.35,
-      0.4,
+      0.4
-      0.45,
-      0.5,
-      0.55
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@44e63",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@82ec1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6c9b8",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@7830e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@616db",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@471b2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c9b4d",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@0466c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@8cb7f",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@e30b5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@493e4",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@d8e62",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6fa3b",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@c5dd0",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f31a4",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@7b64a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@dc6dc",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@9c2bd",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c0d2b",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cb359",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@dff2f",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/hc1/max0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"fbf32dae-f240-47a6-9aa5-b4f8b01a87af","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"2d5be258-449e-43a6-bf51-11e7cbf7ce0a","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}

assets/resources/game/heros/hero/hc1/max1.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.43333333333333335,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -73,74 +73,59 @@
       0.3,
       0.3333333333333333,
       0.36666666666666664,
-      0.4,
+      0.4
-      0.43333333333333335,
-      0.4666666666666667,
-      0.5
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@48efd",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@73b8b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a8748",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@5847f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f3d8c",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@c83ed",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7840a",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@b502d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@329bd",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@5f50e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6c7f7",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@e6eb1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e1b56",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@a7cdc",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@13af7",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@6dfd4",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7fd65",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@5725a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@80024",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@de419",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@1ddfb",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@b489b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@5bc23",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@a0b97",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@77111",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@23fcf",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@11326",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@756bc",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c43be",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/hc1/max1.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"56628bc8-a6c1-4c3d-8326-8a28b03af883","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"69f355b0-4430-4b47-9784-545110b51829","files":[".cconb"],"subMetas":{},"userData":{"name":"max1"}}

assets/resources/game/heros/hero/hc1/move.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.4,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -66,41 +66,31 @@
       0.13333333333333333,
       0.2,
       0.26666666666666666,
-      0.3333333333333333,
+      0.3333333333333333
-      0.4,
-      0.4666666666666667
     ],
     "_values": [
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@d3816",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@d3816",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@81ca7",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@81ca7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c5456",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@c5456",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@230fa",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@230fa",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@425d2",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@425d2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c347a",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@c347a",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@23920",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@8041d",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/hc1/move.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"5390adef-a142-406a-9324-2fa2baefd64e","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"034e64ba-3ad5-4f85-94e7-315de6a7f508","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}

assets/resources/game/heros/hero/hc2.meta

@@ -0,0 +1 @@
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"e40ed6b8-fb97-430f-9a90-e7f81c1aafe3","files":[],"subMetas":{},"userData":{}}

assets/resources/game/heros/hero/hc2/atk0.anim

@@ -0,0 +1,113 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "atk0",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 30,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.26666666666666666,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 6
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.03333333333333333,
+      0.06666666666666667,
+      0.1,
+      0.13333333333333333,
+      0.16666666666666666,
+      0.2,
+      0.23333333333333334
+    ],
+    "_values": [
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@3eb39",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@fe5b1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@fa59f",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@2daf8",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@fbe36",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@b478c",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@31489",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@d7aca",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/heros/hero/hc2/atk0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"c05e1fba-fbad-4d0b-a613-b864a16ab731","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"83e8b59a-9b9c-41d1-b039-123d8ee3c2ca","files":[".cconb"],"subMetas":{},"userData":{"name":"atk0"}}

assets/resources/game/heros/hero/hc2/idle.anim

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "move",
+    "_name": "idle",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.5333333333333333,
+    "_duration": 0.6,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -68,39 +68,44 @@
       0.26666666666666666,
       0.3333333333333333,
       0.4,
-      0.4666666666666667
+      0.4666666666666667,
+      0.5333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@50554",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@28c51",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@419af",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@a5141",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@76cf8",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@7be70",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@fe5f8",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@297ea",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@faa2d",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@6dd09",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@5a1ee",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@ba57f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@e9594",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@bdb6f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@80417",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@72a39",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@8c200",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/hc2/idle.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"5ae5903e-b565-48b7-9aa0-b911e188cba8","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"565db9a3-5c7c-4936-85d2-fefc87086597","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}

assets/resources/game/heros/hero/hc2/max0.anim

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "atk0",
+    "_name": "max0",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5,
+    "_duration": 0.45,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,48 +69,43 @@
       0.25,
       0.3,
       0.35,
-      0.4,
+      0.4
-      0.45
     ],
     "_values": [
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@9aefe",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@1995d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@7f02d",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@a8226",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@f7c7e",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@a736a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@13a75",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@9ea0b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@dbe41",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@eeb88",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@c8315",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@b1640",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@030a6",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@7343d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@d2e36",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@529ba",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@2717b",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@5769b",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "60b9989d-82c6-47fb-a50d-7325e83a99b5@20639",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/heros/hero/hc2/max0.anim.meta

@@ -1 +1 @@
-{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"ef999e38-d873-4d45-a748-35d435d66e7e","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"63385316-79d3-4237-a421-10504927ff71","files":[".cconb"],"subMetas":{},"userData":{"name":"max0"}}

assets/resources/game/heros/hero/hc2/max1.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "idle",
+    "_name": "max1",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 15,
+    "sample": 30,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.8,
+    "_duration": 0.43333333333333335,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,65 +62,70 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
+      0.03333333333333333,
       0.06666666666666667,
+      0.1,
       0.13333333333333333,
+      0.16666666666666666,
       0.2,
+      0.23333333333333334,
       0.26666666666666666,
+      0.3,
       0.3333333333333333,
-      0.4,
+      0.36666666666666664,
-      0.4666666666666667,
+      0.4
-      0.5333333333333333,
-      0.6,
-      0.6666666666666666,
-      0.7333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@2f975",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@f5e50",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@48499",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@62cd5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@eae7b",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@de666",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@54622",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@7d894",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@a3b97",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@674ab",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@4eb63",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@0e1dc",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@9271e",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@5bec9",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@81d84",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@151bd",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@d6df0",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@1fd8a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@b344e",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@1fee8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@c6648",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@a7173",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66e28322-67db-44f8-b67b-217a509fe257@2ada7",
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@8e89e",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "880e4caa-854e-4e80-9ab5-d3d587e4dd4d@c30a2",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]