feat(战斗系统): 添加伤害比例属性并应用到伤害计算

在SDataCom中添加dmg_ratio属性用于调整伤害比例
修改HeroAtkSystem中的伤害计算公式，将dmg_ratio纳入计算

assets/resources/game/05-outline-glow/materials.meta

@@ -1 +0,0 @@
-{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"551a2611-69c0-45ae-bfc6-37f056a34b33","files":[],"subMetas":{},"userData":{}}

assets/resources/game/05-outline-glow/materials/outline-glow.mtl

@@ -1,41 +0,0 @@
-{
-  "__type__": "cc.Material",
-  "_name": "",
-  "_objFlags": 0,
-  "__editorExtras__": {},
-  "_native": "",
-  "_effectAsset": {
-    "__uuid__": "cfeeea4f-db9c-42cd-a0f7-fc5cb37bd3d7",
-    "__expectedType__": "cc.EffectAsset"
-  },
-  "_techIdx": 0,
-  "_defines": [
-    {
-      "USE_TEXTURE": true
-    }
-  ],
-  "_states": [
-    {
-      "rasterizerState": {},
-      "depthStencilState": {},
-      "blendState": {
-        "targets": [
-          {}
-        ]
-      }
-    }
-  ],
-  "_props": [
-    {
-      "glowColor": {
-        "__type__": "cc.Color",
-        "r": 0,
-        "g": 0,
-        "b": 0,
-        "a": 255
-      },
-      "glowWidth": 0.003,
-      "glowThreshold": 0.645
-    }
-  ]
-}

assets/resources/game/05-outline-glow/materials/outline-glow.mtl.meta

@@ -1 +0,0 @@
-{"ver":"1.0.21","importer":"material","imported":true,"uuid":"2fcd55a9-38ca-45aa-9164-68e48aaf51ce","files":[".json"],"subMetas":{},"userData":{}}

assets/resources/game/05-outline-glow/materials/outline-glow2.mtl.meta

@@ -1 +0,0 @@
-{"ver":"1.0.21","importer":"material","imported":true,"uuid":"974af3c9-d7ee-449f-a5df-cd8e2dd49188","files":[".json"],"subMetas":{},"userData":{}}

assets/resources/game/05-outline-glow/shaders.meta

@@ -1 +0,0 @@
-{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"7d369c63-9191-4323-abcc-edda5799a410","files":[],"subMetas":{},"userData":{}}

assets/resources/game/05-outline-glow/shaders/builtin-sprite-outline-glow.effect

@@ -1,169 +0,0 @@
-// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
-CCEffect %{
-  techniques:
-  - passes:
-    - vert: sprite-vs:vert
-      frag: sprite-fs:frag
-      depthStencilState:
-        depthTest: false
-        depthWrite: false
-      blendState:
-        targets:
-        - blend: true
-          blendSrc: src_alpha
-          blendDst: one_minus_src_alpha
-          blendDstAlpha: one_minus_src_alpha
-      rasterizerState:
-        cullMode: none
-      properties:
-        alphaThreshold: { value: 0.5 }
-
-        glowColor:      { value: [1, 1, 1, 1], editor: { type: color } }
-        glowWidth:      { value: 0.05, editor: { slide: true, range: [0, 0.3], step: 0.001 } }
-        glowThreshold:  { value: 1, editor: { slide: true, range: [0, 1], step: 0.001 } }
-}%
-
-CCProgram sprite-vs %{
-  precision highp float;
-  #include <builtin/uniforms/cc-global>
-  #if USE_LOCAL
-    #include <builtin/uniforms/cc-local>
-  #endif
-  #if SAMPLE_FROM_RT
-    #include <common/common-define>
-  #endif
-  in vec3 a_position;
-  in vec2 a_texCoord;
-  in vec4 a_color;
-
-  out vec4 color;
-  out vec2 uv0;
-
-  vec4 vert () {
-    vec4 pos = vec4(a_position, 1);
-
-    #if USE_LOCAL
-      pos = cc_matWorld * pos;
-    #endif
-
-    #if USE_PIXEL_ALIGNMENT
-      pos = cc_matView * pos;
-      pos.xyz = floor(pos.xyz);
-      pos = cc_matProj * pos;
-    #else
-      pos = cc_matViewProj * pos;
-    #endif
-
-    uv0 = a_texCoord;
-    #if SAMPLE_FROM_RT
-      CC_HANDLE_RT_SAMPLE_FLIP(uv0);
-    #endif
-    color = a_color;
-
-    return pos;
-  }
-}%
-
-CCProgram sprite-fs %{
-  precision highp float;
-  #include <builtin/internal/embedded-alpha>
-  #include <builtin/internal/alpha-test>
-
-  in vec4 color;
-
-  uniform FSConstants {
-    vec4 glowColor;
-    float glowWidth;
-    float glowThreshold;
-  };
-
-  #if USE_TEXTURE
-    in vec2 uv0;
-    #pragma builtin(local)
-    layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
-  #endif
-
-  vec4 getTextureColor (sampler2D mainTexture, vec2 uv) {
-    if (uv.x > 1.0 || uv.x < 0.0 || uv.y > 1.0 || uv.y < 0.0) {
-      return vec4(0.0, 0.0, 0.0, 0.0);
-    }
-    return texture(mainTexture, uv);
-  }
-
-  float getColorAlpha (float angle, float dist) {
-    // 角度转弧度，公式为：弧度 = 角度 * (pi / 180)
-    float radian = angle * 3.14 / 180.0;
-    vec2 newUV = uv0 + vec2(dist * cos(radian), dist * sin(radian));
-    vec4 color = getTextureColor(cc_spriteTexture, newUV);
-    return color.a;
-  }
-
-  float getAverageAlpha (float dist) {
-    float totalAlpha = 0.0;
-
-    totalAlpha += getColorAlpha(0.0, dist);
-    totalAlpha += getColorAlpha(30.0, dist);
-    totalAlpha += getColorAlpha(60.0, dist);
-    totalAlpha += getColorAlpha(90.0, dist);
-    totalAlpha += getColorAlpha(120.0, dist);
-    totalAlpha += getColorAlpha(150.0, dist);
-    totalAlpha += getColorAlpha(180.0, dist);
-    totalAlpha += getColorAlpha(210.0, dist);
-    totalAlpha += getColorAlpha(240.0, dist);
-    totalAlpha += getColorAlpha(270.0, dist);
-    totalAlpha += getColorAlpha(300.0, dist);
-    totalAlpha += getColorAlpha(330.0, dist);
-
-    return totalAlpha * 0.0833;
-  }
-
-  float getGlowAlpha () {
-    if (glowWidth == 0.0 ) {
-      return 0.0;
-    }
-
-    float totalAlpha = 0.0;
-    totalAlpha += getAverageAlpha(glowWidth * 0.1);
-    totalAlpha += getAverageAlpha(glowWidth * 0.2);
-    totalAlpha += getAverageAlpha(glowWidth * 0.3);
-    totalAlpha += getAverageAlpha(glowWidth * 0.4);
-    totalAlpha += getAverageAlpha(glowWidth * 0.5);
-    totalAlpha += getAverageAlpha(glowWidth * 0.6);
-    totalAlpha += getAverageAlpha(glowWidth * 0.7);
-    totalAlpha += getAverageAlpha(glowWidth * 0.8);
-    totalAlpha += getAverageAlpha(glowWidth * 0.9);
-    totalAlpha += getAverageAlpha(glowWidth * 1.0);
-
-    return totalAlpha * 0.1;
-  }
-
-  vec4 frag () {
-    vec4 o = vec4(1, 1, 1, 1);
-
-    #if USE_TEXTURE
-      o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0);
-      #if IS_GRAY
-        float gray  = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b;
-        o.r = o.g = o.b = gray;
-      #endif
-    #endif
-
-    float alpha = getGlowAlpha();
-
-    if (alpha <= glowThreshold) {
-      alpha /= glowThreshold;
-      alpha = -1.0 * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) + 1.0;        
-    } else {
-      alpha = 0.0;
-    }
-
-    vec4 dstColor = glowColor * alpha;
-    vec4 scrColor = o;
-
-    o = scrColor * scrColor.a + dstColor * (1.0 - scrColor.a);
-
-    o *= color;
-    ALPHA_TEST(o);
-    return o;
-  }
-}%

assets/resources/game/05-outline-glow/shaders/builtin-sprite-outline-glow2.effect

@@ -1,169 +0,0 @@
-// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
-CCEffect %{
-  techniques:
-  - passes:
-    - vert: sprite-vs:vert
-      frag: sprite-fs:frag
-      depthStencilState:
-        depthTest: false
-        depthWrite: false
-      blendState:
-        targets:
-        - blend: true
-          blendSrc: src_alpha
-          blendDst: one_minus_src_alpha
-          blendDstAlpha: one_minus_src_alpha
-      rasterizerState:
-        cullMode: none
-      properties:
-        alphaThreshold: { value: 0.5 }
-
-        glowColor:      { value: [1, 1, 1, 1], editor: { type: color } }
-        glowWidth:      { value: 0.05, editor: { slide: true, range: [0, 0.3], step: 0.001 } }
-        glowThreshold:  { value: 1, editor: { slide: true, range: [0, 1], step: 0.001 } }
-}%
-
-CCProgram sprite-vs %{
-  precision highp float;
-  #include <builtin/uniforms/cc-global>
-  #if USE_LOCAL
-    #include <builtin/uniforms/cc-local>
-  #endif
-  #if SAMPLE_FROM_RT
-    #include <common/common-define>
-  #endif
-  in vec3 a_position;
-  in vec2 a_texCoord;
-  in vec4 a_color;
-
-  out vec4 color;
-  out vec2 uv0;
-
-  vec4 vert () {
-    vec4 pos = vec4(a_position, 1);
-
-    #if USE_LOCAL
-      pos = cc_matWorld * pos;
-    #endif
-
-    #if USE_PIXEL_ALIGNMENT
-      pos = cc_matView * pos;
-      pos.xyz = floor(pos.xyz);
-      pos = cc_matProj * pos;
-    #else
-      pos = cc_matViewProj * pos;
-    #endif
-
-    uv0 = a_texCoord;
-    #if SAMPLE_FROM_RT
-      CC_HANDLE_RT_SAMPLE_FLIP(uv0);
-    #endif
-    color = a_color;
-
-    return pos;
-  }
-}%
-
-CCProgram sprite-fs %{
-  precision highp float;
-  #include <builtin/internal/embedded-alpha>
-  #include <builtin/internal/alpha-test>
-
-  in vec4 color;
-
-  uniform FSConstants {
-    vec4 glowColor;
-    float glowWidth;
-    float glowThreshold;
-  };
-
-  #if USE_TEXTURE
-    in vec2 uv0;
-    #pragma builtin(local)
-    layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
-  #endif
-
-  vec4 getTextureColor (sampler2D mainTexture, vec2 uv) {
-    if (uv.x > 1.0 || uv.x < 0.0 || uv.y > 1.0 || uv.y < 0.0) {
-      return vec4(0.0, 0.0, 0.0, 0.0);
-    }
-    return texture(mainTexture, uv);
-  }
-
-  float getColorAlpha (float angle, float dist) {
-    // 角度转弧度，公式为：弧度 = 角度 * (pi / 180)
-    float radian = angle * 3.14 / 180.0;
-    vec2 newUV = uv0 + vec2(dist * cos(radian), dist * sin(radian));
-    vec4 color = getTextureColor(cc_spriteTexture, newUV);
-    return color.a;
-  }
-
-  float getAverageAlpha (float dist) {
-    float totalAlpha = 0.0;
-
-    totalAlpha += getColorAlpha(0.0, dist);
-    totalAlpha += getColorAlpha(30.0, dist);
-    totalAlpha += getColorAlpha(60.0, dist);
-    totalAlpha += getColorAlpha(90.0, dist);
-    totalAlpha += getColorAlpha(120.0, dist);
-    totalAlpha += getColorAlpha(150.0, dist);
-    totalAlpha += getColorAlpha(180.0, dist);
-    totalAlpha += getColorAlpha(210.0, dist);
-    totalAlpha += getColorAlpha(240.0, dist);
-    totalAlpha += getColorAlpha(270.0, dist);
-    totalAlpha += getColorAlpha(300.0, dist);
-    totalAlpha += getColorAlpha(330.0, dist);
-
-    return totalAlpha * 0.0833;
-  }
-
-  float getGlowAlpha () {
-    if (glowWidth == 0.0 ) {
-      return 0.0;
-    }
-
-    float totalAlpha = 0.0;
-    totalAlpha += getAverageAlpha(glowWidth * 0.1);
-    totalAlpha += getAverageAlpha(glowWidth * 0.2);
-    totalAlpha += getAverageAlpha(glowWidth * 0.3);
-    totalAlpha += getAverageAlpha(glowWidth * 0.4);
-    totalAlpha += getAverageAlpha(glowWidth * 0.5);
-    totalAlpha += getAverageAlpha(glowWidth * 0.6);
-    totalAlpha += getAverageAlpha(glowWidth * 0.7);
-    totalAlpha += getAverageAlpha(glowWidth * 0.8);
-    totalAlpha += getAverageAlpha(glowWidth * 0.9);
-    totalAlpha += getAverageAlpha(glowWidth * 1.0);
-
-    return totalAlpha * 0.1;
-  }
-
-  vec4 frag () {
-    vec4 o = vec4(1, 1, 1, 1);
-
-    #if USE_TEXTURE
-      o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0);
-      #if IS_GRAY
-        float gray  = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b;
-        o.r = o.g = o.b = gray;
-      #endif
-    #endif
-
-    float alpha = getGlowAlpha();
-
-    if (alpha <= glowThreshold) {
-      alpha /= glowThreshold;
-      alpha = -1.0 * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) + 1.0;        
-    } else {
-      alpha = 0.0;
-    }
-
-    vec4 dstColor = glowColor * alpha;
-    vec4 scrColor = o;
-
-    o = scrColor * scrColor.a + dstColor * (1.0 - scrColor.a);
-
-    o *= color;
-    ALPHA_TEST(o);
-    return o;
-  }
-}%

assets/resources/game/05-outline-glow/shaders/builtin-sprite-outline-glow2.effect.meta

@@ -1 +0,0 @@
-{"ver":"1.7.1","importer":"effect","imported":true,"uuid":"40c25c17-db22-4ae7-8d3a-f73cbb6d36ba","files":[".json"],"subMetas":{},"userData":{"combinations":[{}]}}

assets/resources/game/heros/ha1.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__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": "f9iLivg4dHhJksWCjvY9/w"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,7 +917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/hc1.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__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": "6cZu2rl69OR5+l1nRZerhd"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,7 +917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/hero/hk1/dead.anim

@@ -9,7 +9,7 @@
     "_native": "",
     "sample": 15,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
     "_duration": 1.0666666666666667,
     "_hash": 500763545,

assets/resources/game/heros/hh1.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__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": "e4zlwtvd5P+aVOci53P5lC"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,7 +917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/hk1.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__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": "beiAlRY51OUIUqmpz9SWoV"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,7 +917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -988,7 +985,7 @@
     "__prefab": {
       "__id__": 62
     },
-    "enabledContactListener": true,
+    "enabledContactListener": false,
     "bullet": false,
     "awakeOnLoad": true,
     "_group": 4,
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/hm1.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__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": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,7 +917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/hm2.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__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": "35IEDlwu9Ch7vrlwlSwNdw"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -570,14 +586,14 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 107.768,
+      "y": 129.893,
       "z": 0
     }
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,11 +917,11 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
+      "width": 60,
       "height": 100
     },
     "_anchorPoint": {
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/hz1.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__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": "71mx/IdRVDz5H8mz6V7BsE"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,12 +917,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 80,
-      "height": 100
+      "height": 10
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/mo1.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -305,6 +299,28 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "1dn32Q7fxNOrkpyNeazdIo"
   },
+  {
+    "__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": "devH7HFXJH/5FNGHYdEhes"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -325,14 +341,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -340,7 +356,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -353,15 +369,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -371,8 +381,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -380,7 +396,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -396,7 +412,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -411,7 +427,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -427,7 +443,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -442,7 +458,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -452,7 +468,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -472,7 +488,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -491,14 +507,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -506,7 +522,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -519,23 +535,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -543,7 +559,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -559,7 +575,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -574,7 +590,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -590,7 +606,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -605,7 +621,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -626,7 +642,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -645,14 +661,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -660,7 +676,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -673,20 +689,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -694,7 +710,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -710,7 +726,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -725,7 +741,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -741,7 +757,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -756,7 +772,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -770,14 +786,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -785,7 +801,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -798,20 +814,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -819,7 +835,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -835,7 +851,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -850,7 +866,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -866,7 +882,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -881,7 +897,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -898,12 +914,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 80,
-      "height": 100
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -926,7 +942,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -941,25 +957,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -971,7 +968,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -988,7 +985,7 @@
     "enabledContactListener": true,
     "bullet": false,
     "awakeOnLoad": true,
-    "_group": 4,
+    "_group": 2,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 1,
@@ -1027,13 +1024,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 45
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 90
     },
     "_id": ""
   },
@@ -1041,42 +1038,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1090,16 +1051,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/mo2.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "1dn32Q7fxNOrkpyNeazdIo"
   },
+  {
+    "__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": "65HGZeqCFG6I9S+QXhV5Iy"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,12 +917,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 80,
-      "height": 100
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -991,7 +988,7 @@
     "enabledContactListener": true,
     "bullet": false,
     "awakeOnLoad": true,
-    "_group": 4,
+    "_group": 2,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 1,
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 40
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 80
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/mo3.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "1dn32Q7fxNOrkpyNeazdIo"
   },
+  {
+    "__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": "e4XOt+7BBBWYCH6pjBzbHe"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,7 +917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -944,25 +960,6 @@
     "__type__": "873f8d+SolMEo8DiTTxZRh4",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -974,7 +971,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -991,7 +988,7 @@
     "enabledContactListener": true,
     "bullet": false,
     "awakeOnLoad": true,
-    "_group": 4,
+    "_group": 2,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 1,
@@ -1030,13 +1027,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1041,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1054,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/heros/mo4.prefab

@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
@@ -53,16 +50,10 @@
       },
       {
         "__id__": 63
-      },
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -115,10 +106,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -163,8 +157,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 128,
-      "height": 128
+      "width": 192,
+      "height": 192
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -308,6 +302,28 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "1dn32Q7fxNOrkpyNeazdIo"
   },
+  {
+    "__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": "d05NTLi3pF055eJmK0otVJ"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -328,14 +344,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 12
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -343,7 +359,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 14
+      "__id__": 16
     },
     "targetOverrides": null
   },
@@ -356,15 +372,9 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
-      {
-        "__id__": 18
-      },
       {
         "__id__": 19
       },
@@ -374,8 +384,14 @@
       {
         "__id__": 21
       },
+      {
+        "__id__": 22
+      },
       {
         "__id__": 23
+      },
+      {
+        "__id__": 25
       }
     ],
     "removedComponents": []
@@ -383,7 +399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -399,7 +415,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lpos"
@@ -414,7 +430,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lrot"
@@ -430,7 +446,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_euler"
@@ -445,7 +461,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_active"
@@ -455,7 +471,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 22
+      "__id__": 24
     },
     "propertyPath": [
       "_contentSize"
@@ -475,7 +491,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 18
     },
     "propertyPath": [
       "_lscale"
@@ -494,14 +510,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 24
+      "__id__": 26
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -509,7 +525,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 26
+      "__id__": 28
     },
     "targetOverrides": null
   },
@@ -522,23 +538,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 27
-      },
       {
         "__id__": 29
       },
-      {
-        "__id__": 30
-      },
       {
         "__id__": 31
       },
       {
         "__id__": 32
       },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 36
       }
     ],
     "removedComponents": []
@@ -546,7 +562,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_name"
@@ -562,7 +578,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lpos"
@@ -577,7 +593,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lrot"
@@ -593,7 +609,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_euler"
@@ -608,7 +624,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 35
     },
     "propertyPath": [
       "_lpos"
@@ -629,7 +645,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 28
+      "__id__": 30
     },
     "propertyPath": [
       "_lscale"
@@ -648,14 +664,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 37
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -663,7 +679,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 37
+      "__id__": 39
     },
     "targetOverrides": null
   },
@@ -676,20 +692,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": []
@@ -697,7 +713,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_name"
@@ -713,7 +729,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lpos"
@@ -728,7 +744,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_lrot"
@@ -744,7 +760,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_euler"
@@ -759,7 +775,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 41
     },
     "propertyPath": [
       "_active"
@@ -773,14 +789,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 44
+      "__id__": 46
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -788,7 +804,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 46
+      "__id__": 48
     },
     "targetOverrides": null
   },
@@ -801,20 +817,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 47
-      },
       {
         "__id__": 49
       },
-      {
-        "__id__": 50
-      },
       {
         "__id__": 51
       },
       {
         "__id__": 52
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "removedComponents": []
@@ -822,7 +838,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_name"
@@ -838,7 +854,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lpos"
@@ -853,7 +869,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -869,7 +885,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_euler"
@@ -884,7 +900,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 48
+      "__id__": 50
     },
     "propertyPath": [
       "_active"
@@ -901,7 +917,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,7 +945,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "anm": {
       "__id__": 5
@@ -949,24 +965,6 @@
       "__id__": 1
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 58
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
-  },
-  {
-    "__type__": "7eb34NR6XVEf78HCi5eAKLm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
     "__prefab": {
       "__id__": 60
     },
@@ -974,7 +972,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "654wWWbWpMeYe/ywRBGTMP"
+    "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -991,7 +989,7 @@
     "enabledContactListener": true,
     "bullet": false,
     "awakeOnLoad": true,
-    "_group": 4,
+    "_group": 2,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 1,
@@ -1030,13 +1028,13 @@
     "_restitution": 0,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.1,
-      "y": 33.8
+      "x": 0,
+      "y": 50
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 48.6,
-      "height": 67.5
+      "width": 60,
+      "height": 100
     },
     "_id": ""
   },
@@ -1044,42 +1042,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "23j+p5lLdC+r4iKSVeLNM4"
   },
-  {
-    "__type__": "6f882ofb1pO9Z6gIaAZLCeF",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2jPQ8TNhPj67IyZiPimbD"
-  },
-  {
-    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1093,16 +1055,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 12
+        "__id__": 14
       }
     ]
   }

assets/resources/game/map/lr.anim

@@ -0,0 +1,246 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "lr",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 15,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 5.333333333333333,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      2.6666666666666665,
+      5.333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -0.7820000052452087,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 4.2179999351501465,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -0.7820000052452087,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      2.6666666666666665,
+      5.333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 61.987998962402344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 61.987998962402344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 61.987998962402344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      2.6666666666666665,
+      5.333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/map/lr.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "ee70aa99-524a-4521-bae6-c156881ee3d1",
+  "uuid": "c6a6bc5a-9f6d-404d-947f-e90df0e4d909",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "dun1"
+    "name": "lr"
   }
 }

assets/resources/game/map/lr2.anim

@@ -0,0 +1,246 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "lr2",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 15,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 5.333333333333333,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      2.6666666666666665,
+      5.333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -0.7820000052452087,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -3.7820000648498535,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -0.7820000052452087,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      2.6666666666666665,
+      5.333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 61.987998962402344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 61.987998962402344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 61.987998962402344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      2.6666666666666665,
+      5.333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/map/lr2.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "5bec4860-3cc5-40ca-bac8-e04a29cd04bd",
+  "uuid": "c525e212-96b0-4977-9d73-a57d3cf396f4",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "atk1"
+    "name": "lr2"
   }
 }

assets/resources/game/map/lr3.anim

@@ -0,0 +1,303 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "lr3",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 5,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 24,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      12,
+      19.8,
+      24
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -425,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -422.078003,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 91.625732421875,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 420.9230041503906,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      12,
+      19.8,
+      24
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 120,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 120,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 120,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 120,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      12,
+      19.8,
+      24
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/map/lr3.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "e8c8e45b-6b0f-41bf-8eaf-cd65a80c41de",
+  "uuid": "c31b3fc6-b326-42f0-9680-a76de510e2e4",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "dead"
+    "name": "lr3"
   }
 }

assets/resources/game/map/lr4.anim

@@ -0,0 +1,252 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "lr4",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 5,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 20,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      12,
+      20
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -419.2349853515625,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 89.82899475097656,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 429.2049865722656,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      12,
+      20
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 152.56700134277344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 152.56700134277344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 152.56700134277344,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      12,
+      20
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/map/lr4.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "08ee9331-d203-4948-b49e-b906ef43bc4c",
+  "uuid": "755c82ed-e604-41c3-8944-c6c7df6dc089",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "boom1"
+    "name": "lr4"
   }
 }

assets/resources/game/map/map.anim

@@ -0,0 +1,214 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "map",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 10,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 9.9,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 12
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "2l3_clouds"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      9.9
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -422.078,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 397.518,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 7
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      9.9
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 99.772,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 99.772,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 9
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      9.9
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 11
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/map/map.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "e5523482-12c7-46ed-8a1a-1e6b84baa92e",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "map"
+  }
+}

assets/resources/game/map/zd.anim

@@ -1,39 +1,36 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "shoot2",
+    "_name": "zd",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 48,
+    "sample": 10,
     "speed": 1,
-    "wrapMode": 1,
+    "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.3541666666666667,
+    "_duration": 0.3,
     "_hash": 500763545,
     "_tracks": [
       {
         "__id__": 1
       },
       {
-        "__id__": 7
-      },
-      {
-        "__id__": 18
+        "__id__": 11
       }
     ],
     "_exoticAnimation": null,
     "_events": [],
     "_embeddedPlayers": [],
     "_additiveSettings": {
-      "__id__": 30
+      "__id__": 21
     },
     "_auxiliaryCurveEntries": []
   },
   {
-    "__type__": "cc.animation.ObjectTrack",
+    "__type__": "cc.animation.VectorTrack",
     "_binding": {
       "__type__": "cc.animation.TrackBinding",
       "path": {
@@ -41,29 +38,102 @@
       },
       "proxy": null
     },
-    "_channel": {
-      "__id__": 5
-    }
-  },
-  {
-    "__type__": "cc.animation.TrackPath",
-    "_paths": [
+    "_channels": [
       {
         "__id__": 3
       },
       {
-        "__id__": 4
+        "__id__": 5
       },
-      "spriteFrame"
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
     ]
   },
   {
-    "__type__": "cc.animation.HierarchyPath",
-    "path": "skill"
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
   },
   {
-    "__type__": "cc.animation.ComponentPath",
-    "component": "cc.Sprite"
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.1,
+      0.2,
+      0.3
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
   },
   {
     "__type__": "cc.animation.Channel",
@@ -72,93 +142,117 @@
     }
   },
   {
-    "__type__": "cc.ObjectCurve",
+    "__type__": "cc.RealCurve",
     "_times": [
-      0.125,
-      0.16666666666666666,
-      0.20833333333333334,
-      0.25,
-      0.2916666666666667,
-      0.3333333333333333
+      0,
+      0.1,
+      0.2,
+      0.3
     ],
     "_values": [
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d810b",
-        "__expectedType__": "cc.SpriteFrame"
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -67.366,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@102a8",
-        "__expectedType__": "cc.SpriteFrame"
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -66.366,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@1fa83",
-        "__expectedType__": "cc.SpriteFrame"
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -67.366,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8c851",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d97c1",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@9ddb4",
-        "__expectedType__": "cc.SpriteFrame"
-      }
-    ]
-  },
-  {
-    "__type__": "cc.animation.VectorTrack",
-    "_binding": {
-      "__type__": "cc.animation.TrackBinding",
-      "path": {
-        "__id__": 8
-      },
-      "proxy": null
-    },
-    "_channels": [
-      {
-        "__id__": 10
-      },
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 14
-      },
-      {
-        "__id__": 16
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -68.366,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
       }
     ],
-    "_nComponents": 3
-  },
-  {
-    "__type__": "cc.animation.TrackPath",
-    "_paths": [
-      {
-        "__id__": 9
-      },
-      "position"
-    ]
-  },
-  {
-    "__type__": "cc.animation.HierarchyPath",
-    "path": "Node"
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
   },
   {
     "__type__": "cc.animation.Channel",
     "_curve": {
-      "__id__": 11
+      "__id__": 8
     }
   },
   {
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.1041666641831398
+      0.1,
+      0.2,
+      0.3
     ],
     "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
@@ -194,97 +288,7 @@
   {
     "__type__": "cc.animation.Channel",
     "_curve": {
-      "__id__": 13
-    }
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      0.1041666641831398
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 113.38099670410156,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": {
-          "tangentMode": 0
-        }
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 68.02899932861328,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": {
-          "tangentMode": 0
-        }
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.animation.Channel",
-    "_curve": {
-      "__id__": 15
-    }
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      0.1041666641831398
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 0,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": {
-          "tangentMode": 0
-        }
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 0,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": {
-          "tangentMode": 0
-        }
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.animation.Channel",
-    "_curve": {
-      "__id__": 17
+      "__id__": 10
     }
   },
   {
@@ -295,68 +299,56 @@
     "postExtrapolation": 1
   },
   {
-    "__type__": "cc.animation.ColorTrack",
+    "__type__": "cc.animation.VectorTrack",
     "_binding": {
       "__type__": "cc.animation.TrackBinding",
       "path": {
-        "__id__": 19
+        "__id__": 12
       },
       "proxy": null
     },
     "_channels": [
       {
-        "__id__": 22
+        "__id__": 13
       },
       {
-        "__id__": 24
+        "__id__": 15
       },
       {
-        "__id__": 26
+        "__id__": 17
       },
       {
-        "__id__": 28
+        "__id__": 19
       }
-    ]
+    ],
+    "_nComponents": 3
   },
   {
     "__type__": "cc.animation.TrackPath",
     "_paths": [
-      {
-        "__id__": 20
-      },
-      {
-        "__id__": 21
-      },
-      "color"
+      "scale"
     ]
   },
-  {
-    "__type__": "cc.animation.HierarchyPath",
-    "path": "Node"
-  },
-  {
-    "__type__": "cc.animation.ComponentPath",
-    "component": "cc.Sprite"
-  },
   {
     "__type__": "cc.animation.Channel",
     "_curve": {
-      "__id__": 23
+      "__id__": 14
     }
   },
   {
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.1041666641831398,
-      0.125
+      0.1,
+      0.2,
+      0.3
     ],
     "_values": [
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 255,
+        "value": 1,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -370,7 +362,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 255,
+        "value": 1.01,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -384,7 +376,21 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 255,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -401,22 +407,23 @@
   {
     "__type__": "cc.animation.Channel",
     "_curve": {
-      "__id__": 25
+      "__id__": 16
     }
   },
   {
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.1041666641831398,
-      0.125
+      0.1,
+      0.2,
+      0.3
     ],
     "_values": [
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0,
+        "value": 1,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -430,7 +437,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0,
+        "value": 1.01,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -444,7 +451,21 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -461,22 +482,23 @@
   {
     "__type__": "cc.animation.Channel",
     "_curve": {
-      "__id__": 27
+      "__id__": 18
     }
   },
   {
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.1041666641831398,
-      0.125
+      0.1,
+      0.2,
+      0.3
     ],
     "_values": [
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0,
+        "value": 1,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -490,7 +512,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0,
+        "value": 1,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -504,7 +526,21 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -521,60 +557,13 @@
   {
     "__type__": "cc.animation.Channel",
     "_curve": {
-      "__id__": 29
+      "__id__": 20
     }
   },
   {
     "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      0.1041666641831398,
-      0.125
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 255,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": {
-          "tangentMode": 0
-        }
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 255,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": {
-          "tangentMode": 0
-        }
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 0,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": {
-          "tangentMode": 0
-        }
-      }
-    ],
+    "_times": [],
+    "_values": [],
     "preExtrapolation": 1,
     "postExtrapolation": 1
   },

assets/resources/game/map/zd.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "d3639e74-7140-40f1-b3c2-30d6326337d9",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "zd"
+  }
+}

assets/resources/game/skill/anm/atk.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "af691440-7aca-4cb5-9a78-9bfed9cb70de",
+  "uuid": "7b0c39b9-8974-4136-9e41-23f28772b537",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/resources/game/skill/anm/atk/atk01.anim

@@ -88,7 +88,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.1
+      0.10000000149011612
     ],
     "_values": [
       {
@@ -101,7 +101,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -113,7 +115,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -129,7 +133,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.1
+      0.10000000149011612
     ],
     "_values": [
       {
@@ -142,7 +146,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -154,7 +160,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -170,7 +178,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.1
+      0.10000000149011612
     ],
     "_values": [
       {
@@ -183,7 +191,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -195,7 +205,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -267,8 +279,9 @@
   {
     "__type__": "cc.RealCurve",
     "_times": [
-      0.06666666666666667,
-      0.1
+      0,
+      0.06666667014360428,
+      0.10000000149011612
     ],
     "_values": [
       {
@@ -281,7 +294,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -293,7 +308,23 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -308,8 +339,9 @@
   {
     "__type__": "cc.RealCurve",
     "_times": [
-      0.06666666666666667,
-      0.1
+      0,
+      0.06666667014360428,
+      0.10000000149011612
     ],
     "_values": [
       {
@@ -322,7 +354,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -334,7 +368,23 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -349,8 +399,9 @@
   {
     "__type__": "cc.RealCurve",
     "_times": [
-      0.06666666666666667,
-      0.1
+      0,
+      0.06666667014360428,
+      0.10000000149011612
     ],
     "_values": [
       {
@@ -363,7 +414,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -375,7 +428,23 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -390,21 +459,38 @@
   {
     "__type__": "cc.RealCurve",
     "_times": [
-      0.06666666666666667,
-      0.1
+      0,
+      0.06666667014360428,
+      0.10000000149011612
     ],
     "_values": [
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 255,
+        "value": 146,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 59,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -416,7 +502,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,

assets/resources/game/skill/anm/atk/atk02.anim

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "ready1",
+    "_name": "atk02",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
@@ -9,7 +9,7 @@
     "_native": "",
     "sample": 24,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
     "_duration": 0.375,
     "_hash": 500763545,
@@ -19,7 +19,18 @@
       }
     ],
     "_exoticAnimation": null,
-    "_events": [],
+    "_events": [
+      {
+        "frame": 0.20833333333333334,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.20833333333333334,
+        "func": "atk",
+        "params": []
+      }
+    ],
     "_embeddedPlayers": [],
     "_additiveSettings": {
       "__id__": 7
@@ -80,39 +91,39 @@
     ],
     "_values": [
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@4a442",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@abfb5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@8f9b0",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76684",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@7cc7f",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b1a7d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@373cf",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@0cbf1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3e926",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@500e6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@d974e",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@33fff",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3b694",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@4b91b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3dcb2",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@7ab97",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@b4ba2",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@afacf",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atk/atk02.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "a57cbd2d-9cfe-4964-849d-d2c4f8fcb43f",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk02"
+  }
+}

assets/resources/game/skill/anm/atk/atk03.anim

@@ -1,23 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "heathed",
+    "_name": "atk03",
     "_objFlags": 0,
     "__editorExtras__": {
-      "embeddedPlayerGroups": [
-        {
-          "key": "1726363024652",
-          "name": "animation-clip",
-          "type": "animation-clip"
-        }
-      ]
+      "embeddedPlayerGroups": []
     },
     "_native": "",
     "sample": 24,
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.875,
+    "_duration": 0.4583333333333333,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -25,14 +19,21 @@
       }
     ],
     "_exoticAnimation": null,
-    "_events": [],
-    "_embeddedPlayers": [
+    "_events": [
       {
-        "__id__": 7
+        "frame": 0.20833333333333334,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.20833333333333334,
+        "func": "atk",
+        "params": []
       }
     ],
+    "_embeddedPlayers": [],
     "_additiveSettings": {
-      "__id__": 9
+      "__id__": 7
     },
     "_auxiliaryCurveEntries": []
   },
@@ -63,7 +64,7 @@
   },
   {
     "__type__": "cc.animation.HierarchyPath",
-    "path": "anm"
+    "path": "Node"
   },
   {
     "__type__": "cc.animation.ComponentPath",
@@ -79,81 +80,64 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
+      0.041666666666666664,
       0.08333333333333333,
+      0.125,
       0.16666666666666666,
+      0.20833333333333334,
       0.25,
+      0.2916666666666667,
       0.3333333333333333,
-      0.4166666666666667,
-      0.5,
-      0.5833333333333334,
-      0.6666666666666666,
-      0.75,
-      0.8333333333333334
+      0.375,
+      0.4166666666666667
     ],
     "_values": [
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@66538",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@5b928",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@4fa5c",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@21cc6",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@18e34",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@6fcd5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@fb0d3",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@50d44",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@e21f4",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@fc3f4",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@465e4",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@1bf03",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@b1a60",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c09bc",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@61914",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@01cc3",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@ae881",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@bb1ab",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@2bcdc",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3e49d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@21da0",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@6d522",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]
   },
-  {
-    "__type__": "cc.animation.EmbeddedPlayer",
-    "__editorExtras__": {
-      "group": "1726363024652"
-    },
-    "begin": 0,
-    "end": 0.20833333333333334,
-    "reconciledSpeed": false,
-    "playable": {
-      "__id__": 8
-    }
-  },
-  {
-    "__type__": "cc.animation.EmbeddedAnimationClipPlayable",
-    "path": "",
-    "clip": null
-  },
   {
     "__type__": "cc.AnimationClipAdditiveSettings",
     "enabled": false,

assets/resources/game/skill/anm/atk/atk03.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "10f8c6fc-b0da-476b-b356-d14fc5effc7e",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk03"
+  }
+}

assets/resources/game/skill/anm/atk/atk04.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "boom1",
+    "_name": "atk04",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 60,
+    "sample": 24,
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.25,
+    "_duration": 0.5,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -19,7 +19,18 @@
       }
     ],
     "_exoticAnimation": null,
-    "_events": [],
+    "_events": [
+      {
+        "frame": 0.20833333333333334,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.20833333333333334,
+        "func": "atk",
+        "params": []
+      }
+    ],
     "_embeddedPlayers": [],
     "_additiveSettings": {
       "__id__": 7
@@ -69,80 +80,65 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
-      0.03333333333333333,
-      0.05,
-      0.06666666666666667,
+      0.041666666666666664,
       0.08333333333333333,
-      0.1,
-      0.11666666666666667,
-      0.13333333333333333,
-      0.15,
+      0.125,
       0.16666666666666666,
-      0.18333333333333332,
-      0.2,
-      0.21666666666666667,
-      0.23333333333333334
+      0.20833333333333334,
+      0.25,
+      0.2916666666666667,
+      0.3333333333333333,
+      0.375,
+      0.4166666666666667,
+      0.4583333333333333
     ],
     "_values": [
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@d0d9e",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c1e30",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@a4482",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@f62e8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@0a281",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@ac137",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@5449d",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a99aa",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@0f0c3",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b753c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@84275",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b8d8f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@eb951",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@77aba",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@7cc4a",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@82d97",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@af9f6",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@57229",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@47dca",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@831ec",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@6d189",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@ce25f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@57967",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@943ab",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@951e6",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@6c890",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e151b",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atk/atk04.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "3f4064bb-0208-4059-b117-4639abc24699",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk04"
+  }
+}

assets/resources/game/skill/anm/atk/atk05.anim

@@ -0,0 +1,146 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "atk05",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 24,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.4583333333333333,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [
+      {
+        "frame": 0.20833333333333334,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.20833333333333334,
+        "func": "atk",
+        "params": []
+      }
+    ],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.041666666666666664,
+      0.08333333333333333,
+      0.125,
+      0.16666666666666666,
+      0.20833333333333334,
+      0.25,
+      0.2916666666666667,
+      0.3333333333333333,
+      0.375,
+      0.4166666666666667
+    ],
+    "_values": [
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@30608",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b0b10",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76298",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76bd7",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d4058",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@9197a",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@22801",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76161",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a8392",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e2de4",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d96ab",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/atk/atk05.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "0a1b0645-ad63-4ae6-8bf3-2206c2be7b0b",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk05"
+  }
+}

assets/resources/game/skill/anm/atk/atk_arrow_blue.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "atked_ice",
+    "_name": "atk_arrow_blue",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 12,
+    "sample": 24,
     "speed": 1,
-    "wrapMode": 1,
+    "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.3333333333333333,
+    "_duration": 0.16666666666666666,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -53,7 +53,7 @@
   },
   {
     "__type__": "cc.animation.HierarchyPath",
-    "path": "Node"
+    "path": "E"
   },
   {
     "__type__": "cc.animation.ComponentPath",
@@ -69,25 +69,25 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
+      0.041666666666666664,
       0.08333333333333333,
-      0.16666666666666666,
-      0.25
+      0.125
     ],
     "_values": [
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@363d6",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@a4e22",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@d334a",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@2b0ce",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@b0286",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@29738",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@44455",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@faf10",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atk/atk_arrow_blue.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "6bc68dd8-193e-4951-92cf-7349935a890c",
+  "uuid": "a6568e30-fa37-4afc-990f-34caeafc39b6",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "atked_crit"
+    "name": "atk_arrow_blue"
   }
 }

assets/resources/game/skill/anm/atk/atk_arrow_green.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "atk1",
+    "_name": "atk_arrow_blue",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 15,
+    "sample": 24,
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.26666666666666666,
+    "_duration": 0.16666666666666666,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -53,7 +53,7 @@
   },
   {
     "__type__": "cc.animation.HierarchyPath",
-    "path": "Node"
+    "path": "E"
   },
   {
     "__type__": "cc.animation.ComponentPath",
@@ -69,25 +69,25 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.06666666666666667,
-      0.13333333333333333,
-      0.2
+      0.041666666666666664,
+      0.08333333333333333,
+      0.125
     ],
     "_values": [
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@a22e7",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@a22e7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@20740",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@20740",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@35944",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@35944",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@b9343",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@b9343",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atk/atk_arrow_green.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "717b5364-8e77-4a5c-a0f0-81c613275b4e",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk_arrow_green"
+  }
+}

assets/resources/game/skill/anm/atk/atk_arrow_red.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "atked_fire",
+    "_name": "atk_arrow_red",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 12,
+    "sample": 24,
     "speed": 1,
-    "wrapMode": 1,
+    "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.3333333333333333,
+    "_duration": 0.16666666666666666,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -53,7 +53,7 @@
   },
   {
     "__type__": "cc.animation.HierarchyPath",
-    "path": "Node"
+    "path": "E"
   },
   {
     "__type__": "cc.animation.ComponentPath",
@@ -69,25 +69,25 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
+      0.041666666666666664,
       0.08333333333333333,
-      0.16666666666666666,
-      0.25
+      0.125
     ],
     "_values": [
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@ed41a",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@1b09a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@0d199",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@341ae",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@41e9e",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@6459e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@f66be",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@820a5",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atk/atk_arrow_red.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "f0e218a9-5cd4-476f-a65d-fd17c26afa9e",
+  "uuid": "4c6dbd6c-4ecc-4f66-a1e0-89083ec7939f",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "atked_fire"
+    "name": "atk_arrow_red"
   }
 }

assets/resources/game/skill/anm/atk/m_ball_water_1.anim

@@ -0,0 +1,379 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "m_ball_water_1",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 15,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.26666666666666666,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 7
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 18
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.06666666666666667,
+      0.13333333333333333,
+      0.2
+    ],
+    "_values": [
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@59cfc",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@b5811",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@bb70c",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@b6fe2",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 8
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 9
+      },
+      "scale"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 11
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.06666666666666667,
+      0.13333333333333333,
+      0.2
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -1.2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -1.2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 13
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.06666666666666667,
+      0.13333333333333333,
+      0.2
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 15
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.06666666666666667,
+      0.13333333333333333,
+      0.2
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 17
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/atk/m_ball_water_1.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "ca8450cc-65f1-4d89-8e95-7f4f316e0972",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "m_ball_water_1"
+  }
+}

assets/resources/game/skill/anm/atk06.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "dead",
+    "_name": "atk06",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 60,
+    "sample": 24,
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.35,
+    "_duration": 0.4166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -21,9 +21,14 @@
     "_exoticAnimation": null,
     "_events": [
       {
-        "frame": 0,
+        "frame": 0.20833333333333334,
         "func": "",
         "params": []
+      },
+      {
+        "frame": 0.20833333333333334,
+        "func": "atk",
+        "params": []
       }
     ],
     "_embeddedPlayers": [],
@@ -59,7 +64,7 @@
   },
   {
     "__type__": "cc.animation.HierarchyPath",
-    "path": "anm"
+    "path": "Node"
   },
   {
     "__type__": "cc.animation.ComponentPath",
@@ -75,60 +80,55 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.03333333333333333,
-      0.06666666666666667,
-      0.1,
-      0.13333333333333333,
+      0.041666666666666664,
+      0.08333333333333333,
+      0.125,
       0.16666666666666666,
-      0.2,
-      0.23333333333333334,
-      0.26666666666666666,
-      0.3,
-      0.3333333333333333
+      0.20833333333333334,
+      0.25,
+      0.2916666666666667,
+      0.3333333333333333,
+      0.375
     ],
     "_values": [
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d9972",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@1009c",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8cc15",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@de62b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d528c",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@5b01f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c5dc4",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@254e1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ccf07",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b42a1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@a354b",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@4ba4a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7a8d7",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b9773",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@4ee7c",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@70740",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e7eb7",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@8a2ee",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@017b5",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@9397e",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@04fca",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atk06.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "a5ce1bb6-3970-4acd-8d89-1c2060d395cc",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "atk06"
+  }
+}

assets/resources/game/skill/anm/atked/atked.anim

@@ -75,19 +75,19 @@
     ],
     "_values": [
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@fa268",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@fa268",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@370a7",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@370a7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@712e9",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@712e9",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@17c81",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@17c81",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atked/atked_crit.anim

@@ -1,17 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "",
-  "_objFlags": 0,
-  "_native": "",
-  "sample": 60,
-  "speed": 1,
-  "wrapMode": 1,
-  "events": [],
-  "_duration": 0,
-  "_keys": [],
-  "_stepness": 0,
-  "curveDatas": {},
-  "_curves": [],
-  "_commonTargets": [],
-  "_hash": 0
-}

assets/resources/game/skill/anm/atked/atked_wind.anim

@@ -1,17 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "",
-  "_objFlags": 0,
-  "_native": "",
-  "sample": 60,
-  "speed": 1,
-  "wrapMode": 1,
-  "events": [],
-  "_duration": 0,
-  "_keys": [],
-  "_stepness": 0,
-  "curveDatas": {},
-  "_curves": [],
-  "_commonTargets": [],
-  "_hash": 0
-}

assets/resources/game/skill/anm/atked/atked_wind.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "507cb7a7-d278-47f7-aba0-f9ddcfe409c8",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "atked_wind"
-  }
-}

assets/resources/game/skill/anm/buff.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "079458b7-6dbd-42d1-9291-05916ee27400",
+  "uuid": "813f9aa5-860d-4c9c-b99a-8704a3e0eb97",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/resources/game/skill/anm/buff/buff_wind.anim

@@ -0,0 +1,130 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "buff_wind",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 18,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.5555555555555556,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.05555555555555555,
+      0.1111111111111111,
+      0.16666666666666666,
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333,
+      0.3888888888888889,
+      0.4444444444444444,
+      0.5
+    ],
+    "_values": [
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@121c9",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@32458",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@770ee",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@bad49",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@c9790",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@121c9",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@32458",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@770ee",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@bad49",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@c9790",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/buff/buff_wind.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "4c6a3159-786c-45c9-b8b6-e6278cdcf37c",
+  "uuid": "67419693-8fea-48df-a2f4-d52e993932c0",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "atked_ice"
+    "name": "buff_wind"
   }
 }

assets/resources/game/skill/anm/buff/down.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "shangguang3",
+    "_name": "down",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 24,
+    "sample": 18,
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.4583333333333333,
+    "_duration": 0.3333333333333333,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,35 +69,35 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.08333333333333333,
+      0.05555555555555555,
+      0.1111111111111111,
       0.16666666666666666,
-      0.25,
-      0.3333333333333333,
-      0.4166666666666667
+      0.2222222222222222,
+      0.2777777777777778
     ],
     "_values": [
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d810b",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@bcbe8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@102a8",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@c6ceb",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@1fa83",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@38bcc",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8c851",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@01314",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d97c1",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@d9968",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@9ddb4",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@54fb3",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/buff/down.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "e4ea1883-a8ae-446f-94f2-92d50ae233a4",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "down"
+  }
+}

assets/resources/game/skill/anm/buff/dun_jin.anim

@@ -0,0 +1,125 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "up_ap",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 18,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.5,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.05555555555555555,
+      0.1111111111111111,
+      0.16666666666666666,
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333,
+      0.3888888888888889,
+      0.4444444444444444
+    ],
+    "_values": [
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@a1295",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@68c29",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@b457b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@bee77",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@09622",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@730f3",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@27fea",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@4130d",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@3ef60",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/buff/dun_jin.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "715eb15a-a76e-4c36-a990-29112449fcb8",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "dun_jin"
+  }
+}

assets/resources/game/skill/anm/buff/dun_red.anim

@@ -0,0 +1,125 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "dun_red",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 18,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.5,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.05555555555555555,
+      0.1111111111111111,
+      0.16666666666666666,
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333,
+      0.3888888888888889,
+      0.4444444444444444
+    ],
+    "_values": [
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@4e819",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@0e5fe",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@1f0e3",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@f760f",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@849ce",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@fb7bb",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@9dafb",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@7e50b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@08e85",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/buff/dun_red.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "2c6678eb-ce52-4ea9-a4b5-ce8791af9185",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "dun_red"
+  }
+}

assets/resources/game/skill/anm/buff/foot.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "shangguang2",
+    "_name": "foot",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 24,
+    "sample": 12,
     "speed": 1,
-    "wrapMode": 1,
+    "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.375,
+    "_duration": 0.4166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -53,7 +53,7 @@
   },
   {
     "__type__": "cc.animation.HierarchyPath",
-    "path": "skill"
+    "path": "anm"
   },
   {
     "__type__": "cc.animation.ComponentPath",
@@ -76,23 +76,23 @@
     ],
     "_values": [
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d58f7",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@4ebaa",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@11e74",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@c7b38",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@59298",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@ea803",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@0abf5",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@bdfa7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@f1a22",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@6f0d9",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/buff/foot.anim.meta

@@ -2,7 +2,7 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "068fd722-492b-4ad3-84e6-09af394d6ac1",
+  "uuid": "bcb8ac44-559b-4386-97c0-20562298fe39",
   "files": [
     ".cconb"
   ],

assets/resources/game/skill/anm/buff/heath.anim

@@ -0,0 +1,135 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "heath",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 18,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.6111111111111112,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.05555555555555555,
+      0.1111111111111111,
+      0.16666666666666666,
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333,
+      0.3888888888888889,
+      0.4444444444444444,
+      0.5,
+      0.5555555555555556
+    ],
+    "_values": [
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@66538",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@4fa5c",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@18e34",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@fb0d3",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e21f4",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@465e4",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b1a60",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@61914",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@ae881",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@2bcdc",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@21da0",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/buff/heath.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "3ab84ff4-c98b-4abd-9c40-79200c3443ca",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "heath"
+  }
+}

assets/resources/game/skill/anm/buff/iced.anim

@@ -0,0 +1,30 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "iced",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 18,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0,
+    "_hash": 500763545,
+    "_tracks": [],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 1
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/buff/iced.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "7d5f1c33-84b0-4bcb-8fe5-2ee4dfa468ef",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "iced"
+  }
+}

assets/resources/game/skill/anm/buff/max.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.3333333333333333,
+    "_duration": 0.4166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -71,23 +71,28 @@
       0,
       0.08333333333333333,
       0.16666666666666666,
-      0.25
+      0.25,
+      0.3333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "33ff8a85-5d28-42b6-afc8-e0563b2943f6@1ca40",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@2cfc2",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "33ff8a85-5d28-42b6-afc8-e0563b2943f6@66637",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@1ca40",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "33ff8a85-5d28-42b6-afc8-e0563b2943f6@cf65d",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@66637",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "33ff8a85-5d28-42b6-afc8-e0563b2943f6@1e597",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@cf65d",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@1e597",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/buff/shielded.anim

@@ -78,31 +78,31 @@
     ],
     "_values": [
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@da16f",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@da16f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@1b0a7",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@1b0a7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@d07ee",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@d07ee",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@6f94d",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@6f94d",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@88811",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@88811",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3d54b",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@3d54b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@9630b",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@9630b",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/buff/up_ap.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "foot",
+    "_name": "up_ap",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 12,
+    "sample": 18,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5833333333333334,
+    "_duration": 0.3888888888888889,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -53,7 +53,7 @@
   },
   {
     "__type__": "cc.animation.HierarchyPath",
-    "path": "anm"
+    "path": "skill"
   },
   {
     "__type__": "cc.animation.ComponentPath",
@@ -69,40 +69,40 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.08333333333333333,
+      0.05555555555555555,
+      0.1111111111111111,
       0.16666666666666666,
-      0.25,
-      0.3333333333333333,
-      0.4166666666666667,
-      0.5
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@7305a",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@3ddda",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@a099c",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@a8f65",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@1c1b9",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@25d02",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@53222",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@68615",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3a77d",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@fa476",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@71fda",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@dbcad",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@aa501",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@30252",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/buff/up_ap.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "b01ee4bf-1c59-4158-806f-488e00ed7b5a",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "up_ap"
+  }
+}

assets/resources/game/skill/anm/buff/up_lv.anim

@@ -0,0 +1,120 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "up_lv",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 18,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.4444444444444444,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.05555555555555555,
+      0.1111111111111111,
+      0.16666666666666666,
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333,
+      0.3888888888888889
+    ],
+    "_values": [
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@a90cf",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@9b749",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@5d24b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@1821b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@10c9e",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@cbfd2",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@dbfbc",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@75047",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/buff/up_lv.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "d8b644aa-bc1e-4b27-b899-2d792eac6a2d",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "up_lv"
+  }
+}

assets/resources/game/skill/anm/buff/up_speed.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "dun1",
+    "_name": "up_speed",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 12,
+    "sample": 18,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5833333333333334,
+    "_duration": 0.3888888888888889,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -22,7 +22,7 @@
     "_events": [],
     "_embeddedPlayers": [],
     "_additiveSettings": {
-      "__id__": 6
+      "__id__": 7
     },
     "_auxiliaryCurveEntries": []
   },
@@ -36,7 +36,7 @@
       "proxy": null
     },
     "_channel": {
-      "__id__": 4
+      "__id__": 5
     }
   },
   {
@@ -45,9 +45,16 @@
       {
         "__id__": 3
       },
+      {
+        "__id__": 4
+      },
       "spriteFrame"
     ]
   },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
   {
     "__type__": "cc.animation.ComponentPath",
     "component": "cc.Sprite"
@@ -55,47 +62,47 @@
   {
     "__type__": "cc.animation.Channel",
     "_curve": {
-      "__id__": 5
+      "__id__": 6
     }
   },
   {
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.08333333333333333,
+      0.05555555555555555,
+      0.1111111111111111,
       0.16666666666666666,
-      0.25,
-      0.3333333333333333,
-      0.4166666666666667,
-      0.5
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@da16f",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@e8dba",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@1b0a7",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@dcb1f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@d07ee",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@c9c3b",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@6f94d",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@4ef5f",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@88811",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@30936",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3d54b",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@9e8ce",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@9630b",
+        "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@82139",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/buff/up_speed.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "cbac7690-586d-42bf-bd2c-2e2fc279b819",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "up_speed"
+  }
+}

assets/resources/game/skill/anm/heathed.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "e0c4f819-15df-490b-b85b-bb5c5ec1e33b",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "heathed"
-  }
-}

assets/resources/game/skill/anm/ready.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "3c0769e6-af1a-4a1c-af5e-b3957693f699",
+  "uuid": "38e9b3f0-0e80-4b93-a66a-fefa7e416949",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/resources/game/skill/anm/ready/blues.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "shoot1",
+    "_name": "blues",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 48,
+    "sample": 20,
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.1875,
+    "_duration": 0.25,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,30 +69,30 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.041666666666666664,
-      0.08333333333333333,
-      0.125,
-      0.16666666666666666
+      0.05,
+      0.1,
+      0.15,
+      0.2
     ],
     "_values": [
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d58f7",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d58f7",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@11e74",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@11e74",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@59298",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@59298",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@0abf5",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@0abf5",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@f1a22",
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@f1a22",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/ready/blues.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "31148ce8-666d-4dec-b6a5-acb8a32188eb",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "blues"
+  }
+}

assets/resources/game/skill/anm/ready/reds.anim

@@ -0,0 +1,105 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "reds",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 20,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.25,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.05,
+      0.1,
+      0.15,
+      0.2
+    ],
+    "_values": [
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@07243",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@55d08",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@36291",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@4052b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e928b",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

assets/resources/game/skill/anm/ready/reds.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "0bbd59e8-5aae-4e40-a54a-00db09136362",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "reds"
+  }
+}

assets/resources/game/skill/anm/ready1.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "517fed99-d09a-416a-b37d-607dd4dd7e9d",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "ready1"
-  }
-}

assets/resources/game/skill/anm/shangguang2.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "de769c0b-82f1-4424-b4aa-624c38e3b48b",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "shangguang2"
-  }
-}

assets/resources/game/skill/anm/shangguang3.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "08db0cf0-cbd2-4562-b2aa-589611a0ba24",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "shangguang3"
-  }
-}

assets/resources/game/skill/anm/shoot1.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "1badb6e0-6f9b-47db-81ec-4ae15720ceb3",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "shoot1"
-  }
-}

assets/resources/game/skill/anm/shoot2.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "f8336711-584e-45c3-bd16-3f9b1ad084d0",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "shoot2"
-  }
-}

assets/resources/game/skill/anm/strong1.anim

@@ -1,103 +0,0 @@
-[
-  {
-    "__type__": "cc.AnimationClip",
-    "_name": "strong1",
-    "_objFlags": 0,
-    "__editorExtras__": {
-      "embeddedPlayerGroups": []
-    },
-    "_native": "",
-    "sample": 10,
-    "speed": 1,
-    "wrapMode": 2,
-    "enableTrsBlending": false,
-    "_duration": 0.6,
-    "_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.1,
-      0.2,
-      0.3,
-      0.4,
-      0.5
-    ],
-    "_values": [
-      {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@9d39d",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@c6074",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@646fe",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@d6c8e",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@e2a6f",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@a9590",
-        "__expectedType__": "cc.SpriteFrame"
-      }
-    ]
-  },
-  {
-    "__type__": "cc.AnimationClipAdditiveSettings",
-    "enabled": false,
-    "refClip": null
-  }
-]

assets/resources/game/skill/anm/strong1.anim.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "46a4b1ed-56be-49f1-8441-6868518c803e",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "strong1"
-  }
-}