diff --git a/assets/resources/game/gui/materials/outline-blue.mtl b/assets/resources/game/gui/materials/outline-blue.mtl
index 61125375..a7558931 100644
--- a/assets/resources/game/gui/materials/outline-blue.mtl
+++ b/assets/resources/game/gui/materials/outline-blue.mtl
@@ -30,11 +30,11 @@
       "glowColor": {
         "__type__": "cc.Color",
         "r": 20,
-        "g": 227,
+        "g": 152,
         "b": 255,
         "a": 255
       },
-      "glowWidth": 0.002,
+      "glowWidth": 0.004,
       "glowThreshold": 0.887
     }
   ]
diff --git a/assets/resources/game/gui/materials/outline-glow.mtl b/assets/resources/game/gui/materials/outline-glow.mtl
index 73abd380..2d0214dd 100644
--- a/assets/resources/game/gui/materials/outline-glow.mtl
+++ b/assets/resources/game/gui/materials/outline-glow.mtl
@@ -34,7 +34,7 @@
         "b": 20,
         "a": 255
       },
-      "glowWidth": 0.002,
+      "glowWidth": 0.004,
       "glowThreshold": 0.887
     }
   ]
diff --git a/assets/resources/game/gui/materials/outline-green.mtl b/assets/resources/game/gui/materials/outline-green.mtl
index 19c0da5b..36afc057 100644
--- a/assets/resources/game/gui/materials/outline-green.mtl
+++ b/assets/resources/game/gui/materials/outline-green.mtl
@@ -34,7 +34,7 @@
         "b": 20,
         "a": 255
       },
-      "glowWidth": 0.002,
+      "glowWidth": 0.004,
       "glowThreshold": 0.887
     }
   ]
diff --git a/assets/resources/game/gui/materials/outline-pur.mtl b/assets/resources/game/gui/materials/outline-pur.mtl
index 8d17cb95..59c05fca 100644
--- a/assets/resources/game/gui/materials/outline-pur.mtl
+++ b/assets/resources/game/gui/materials/outline-pur.mtl
@@ -34,7 +34,7 @@
         "b": 255,
         "a": 255
       },
-      "glowWidth": 0.002,
+      "glowWidth": 0.004,
       "glowThreshold": 0.887
     }
   ]
diff --git a/assets/resources/game/gui/materials/outline-yellow.mtl b/assets/resources/game/gui/materials/outline-yellow.mtl
index 059bf767..d77f7d1e 100644
--- a/assets/resources/game/gui/materials/outline-yellow.mtl
+++ b/assets/resources/game/gui/materials/outline-yellow.mtl
@@ -29,12 +29,12 @@
     {
       "glowColor": {
         "__type__": "cc.Color",
-        "r": 247,
-        "g": 255,
-        "b": 46,
+        "r": 255,
+        "g": 245,
+        "b": 0,
         "a": 255
       },
-      "glowWidth": 0.002,
+      "glowWidth": 0.004,
       "glowThreshold": 0.887
     }
   ]
diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab
index ce18c20f..eadfabae 100644
--- a/assets/resources/game/heros/ha1.prefab
+++ b/assets/resources/game/heros/ha1.prefab
@@ -313,7 +313,10 @@
     "__prefab": {
       "__id__": 16
     },
-    "_customMaterial": null,
+    "_customMaterial": {
+      "__uuid__": "2b8a37ee-732c-4c5b-b6a4-136f3e581cde",
+      "__expectedType__": "cc.Material"
+    },
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
diff --git a/assets/resources/game/skill/anm/atk/fire_yuns.anim b/assets/resources/game/skill/anm/atk/fire_yuns.anim
new file mode 100644
index 00000000..41d54bc8
--- /dev/null
+++ b/assets/resources/game/skill/anm/atk/fire_yuns.anim
@@ -0,0 +1,450 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "fire_yuns",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 24,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 1.0416666666666667,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 18
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [
+      {
+        "frame": 0.6666666666666666,
+        "func": "",
+        "params": []
+      },
+      {
+        "frame": 0.6666666666666666,
+        "func": "atk",
+        "params": []
+      }
+    ],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 24
+    },
+    "_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": "Node"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.625
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -585.5050048828125,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -26.145000457763672,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 7
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.625
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 840.4609985351562,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -59.20899963378906,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 9
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.625
+    ],
+    "_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
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 11
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 13
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 16
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 15
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 17
+    }
+  },
+  {
+    "__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,
+      0.4583333333333333,
+      0.5,
+      0.5416666666666666,
+      0.5833333333333334,
+      0.6666666666666666
+    ],
+    "_values": [
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@59ec8",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3a170",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@482b5",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@59ec8",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3a170",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@482b5",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@59ec8",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3a170",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@482b5",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@59ec8",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3a170",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@482b5",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@59ec8",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3a170",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@482b5",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      null
+    ]
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 19
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 22
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "FNode"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 23
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.625,
+      0.6666666666666666,
+      0.7083333333333334,
+      0.75,
+      0.7916666666666666,
+      0.8333333333333334,
+      0.875,
+      0.9166666666666666,
+      1
+    ],
+    "_values": [
+      null,
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@efc4f",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@fdba9",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@11f7a",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3f33e",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@9bd71",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@03e27",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@8dffc",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a083d",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      null
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skill/anm/atk/fire_yuns.anim.meta b/assets/resources/game/skill/anm/atk/fire_yuns.anim.meta
new file mode 100644
index 00000000..6100db1a
--- /dev/null
+++ b/assets/resources/game/skill/anm/atk/fire_yuns.anim.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "3054b073-7605-4b75-a341-0338948801d7",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "fire_yuns"
+  }
+}
diff --git a/assets/resources/game/skill/anm/atk/ice_up.anim b/assets/resources/game/skill/anm/atk/ice_up.anim
index 22adc5a0..4ce7d26d 100644
--- a/assets/resources/game/skill/anm/atk/ice_up.anim
+++ b/assets/resources/game/skill/anm/atk/ice_up.anim
@@ -9,9 +9,9 @@
     "_native": "",
     "sample": 12,
     "speed": 1,
-    "wrapMode": 2,
+    "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.75,
+    "_duration": 0.9166666666666666,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -19,6 +19,12 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 19
       }
     ],
     "_exoticAnimation": null,
@@ -36,7 +42,7 @@
     ],
     "_embeddedPlayers": [],
     "_additiveSettings": {
-      "__id__": 13
+      "__id__": 25
     },
     "_auxiliaryCurveEntries": []
   },
@@ -178,10 +184,10 @@
       0.16666666666666666,
       0.25,
       0.3333333333333333,
-      0.4166666666666667,
       0.5,
       0.5833333333333334,
-      0.6666666666666666
+      0.6666666666666666,
+      0.8333333333333334
     ],
     "_values": [
       {
@@ -222,6 +228,188 @@
       }
     ]
   },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 14
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 17
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node/ice22"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 18
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0.08333333333333333,
+      0.16666666666666666,
+      0.25,
+      0.3333333333333333,
+      0.4166666666666667,
+      0.5,
+      0.5833333333333334,
+      0.6666666666666666,
+      0.75
+    ],
+    "_values": [
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@171f1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c445c",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3f936",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b0413",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@5ec2b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@94983",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@19b2f",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@55162",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b243f",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 20
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 23
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 22
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node/ice23"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 24
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0.16666666666666666,
+      0.25,
+      0.3333333333333333,
+      0.4166666666666667,
+      0.5,
+      0.5833333333333334,
+      0.6666666666666666,
+      0.75,
+      0.8333333333333334
+    ],
+    "_values": [
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@171f1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c445c",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3f936",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b0413",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@5ec2b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@94983",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@19b2f",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@55162",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b243f",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
   {
     "__type__": "cc.AnimationClipAdditiveSettings",
     "enabled": false,
diff --git a/assets/resources/game/skill/atk/atk_s3.prefab b/assets/resources/game/skill/atk/atk_s3.prefab
index db6e7a00..86925459 100644
--- a/assets/resources/game/skill/atk/atk_s3.prefab
+++ b/assets/resources/game/skill/atk/atk_s3.prefab
@@ -114,8 +114,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -2,
-      "y": 2,
+      "x": -1.5,
+      "y": 1.5,
       "z": 1
     },
     "_mobility": 0,
@@ -173,8 +173,8 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 224,
+      "r": 0,
+      "g": 0,
       "b": 0,
       "a": 255
     },
@@ -250,8 +250,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 2.3,
-      "y": 2,
+      "x": 1.8,
+      "y": 1.5,
       "z": 1
     },
     "_mobility": 0,
@@ -386,8 +386,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 2.3,
-      "y": 2,
+      "x": 1.8,
+      "y": 1.5,
       "z": 1
     },
     "_mobility": 0,
@@ -500,8 +500,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 200
+      "width": 120,
+      "height": 120
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -622,8 +622,8 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 200
+      "width": 120,
+      "height": 120
     },
     "_id": ""
   },
diff --git a/assets/resources/game/skill/atk/fire_yuns.prefab b/assets/resources/game/skill/atk/fire_yuns.prefab
new file mode 100644
index 00000000..8035696f
--- /dev/null
+++ b/assets/resources/game/skill/atk/fire_yuns.prefab
@@ -0,0 +1,510 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "fire_yuns",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "fire_yuns",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -585.505,
+      "y": 840.461,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0.25881904510252074,
+      "w": 0.9659258262890683
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.9,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 30
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 119,
+      "height": 167
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93pNmvtQlLSqtTgIepyEmA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@59ec8",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": {
+      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12eKc8gltBz50frJCS5+ww"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3arqAMBz1MvoXBzeDaL5M/",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "FNode",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 167,
+      "height": 83
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "61qJ8Ub2NK5q1qi/3W36WF"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": {
+      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "58Wuxbr6pN+KG9Fp0VMhJD"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "93nkd064dJoap5qshPcQP6",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "3054b073-7605-4b75-a341-0338948801d7",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "3054b073-7605-4b75-a341-0338948801d7",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c2RDvksalG2acL3tyGCY0t"
+  },
+  {
+    "__type__": "57aabs7TE1J5obTAZczc+64",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "atk_x": 0,
+    "atk_y": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
+  },
+  {
+    "__type__": "cc.RigidBody2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "enabledContactListener": true,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_group": 1,
+    "_type": 1,
+    "_allowSleep": false,
+    "_gravityScale": 1,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
+  },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "tag": 0,
+    "_group": 1,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 120
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skill/atk/fire_yuns.prefab.meta b/assets/resources/game/skill/atk/fire_yuns.prefab.meta
new file mode 100644
index 00000000..1b7f0519
--- /dev/null
+++ b/assets/resources/game/skill/atk/fire_yuns.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "9bd2e32c-363c-413d-954c-72d7481ec035",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "fire_yuns"
+  }
+}
diff --git a/assets/resources/game/skill/atk/ice_up.prefab b/assets/resources/game/skill/atk/ice_up.prefab
index 6ca90e92..1a06673c 100644
--- a/assets/resources/game/skill/atk/ice_up.prefab
+++ b/assets/resources/game/skill/atk/ice_up.prefab
@@ -25,28 +25,28 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 32
       },
       {
-        "__id__": 22
+        "__id__": 34
       },
       {
-        "__id__": 24
+        "__id__": 36
       },
       {
-        "__id__": 26
+        "__id__": 38
       },
       {
-        "__id__": 28
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -4.55,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -86,24 +86,30 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 27
       },
       {
-        "__id__": 17
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 31
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 5.033,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -131,7 +137,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "node",
+    "_name": "ice22",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -150,6 +156,272 @@
     "_prefab": {
       "__id__": 8
     },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 26.006,
+      "y": 40,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.9,
+      "y": 0.9,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 5
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 156,
+      "height": 73
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "75ecjTAbBKka5hugmcvKKC"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 7
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "09NldQDqtCTL284lm9VTPd"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c2af1xZLVBjInvw/elXiNX",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "ice23",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -31.068,
+      "y": 40,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.9,
+      "y": 0.9,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 156,
+      "height": 73
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c2xP355UpN0oN50xdAEoBc"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "beXX+5jAVJ5bGd4lEXai5i"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c4gZP6WSdMjIKhnfBGd5qg",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -185,11 +457,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 3
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 5
+      "__id__": 17
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -213,11 +485,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 3
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 7
+      "__id__": 19
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -229,10 +501,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@8713a",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 1,
@@ -277,14 +546,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 22
       },
       {
-        "__id__": 12
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -321,11 +590,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 9
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 11
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -349,11 +618,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 9
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 25
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -365,10 +634,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@8713a",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 1,
@@ -411,7 +677,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 28
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -439,7 +705,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 30
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -451,10 +717,7 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@171f1",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 1,
@@ -500,7 +763,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 33
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -528,7 +791,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 35
     },
     "playOnLoad": true,
     "_clips": [
@@ -557,11 +820,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 37
     },
     "atk_x": 0,
     "atk_y": 0,
-    "debugMode": true,
     "_id": ""
   },
   {
@@ -578,7 +840,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 39
     },
     "enabledContactListener": true,
     "bullet": false,
@@ -612,7 +874,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 41
     },
     "tag": 0,
     "_group": 1,
@@ -628,7 +890,7 @@
     "_size": {
       "__type__": "cc.Size",
       "width": 150,
-      "height": 150
+      "height": 50
     },
     "_id": ""
   },
diff --git a/assets/script/game/common/config/GameSet.ts b/assets/script/game/common/config/GameSet.ts
index fc6515bc..be1e74da 100644
--- a/assets/script/game/common/config/GameSet.ts
+++ b/assets/script/game/common/config/GameSet.ts
@@ -23,7 +23,7 @@ export enum FightSet {
     MORE_RC=10,//更多次数 广告获取的次数
     HEARTPOS=-320,//基地位置
     HERO_MAX_NUM=6,//英雄最大数量
-    MERGE_MAX=3,  //英雄最大等级
+    MERGE_MAX=5,  //英雄最大等级
     MERGE_NEED=3,  //英雄升级需要的英雄数
     // BACK_RANG=30,//后退范围
     BACK_RANG=30,//后退范围
diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts
index bf168c0d..0dd1c75c 100644
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -221,36 +221,35 @@ export const SkillSet: Record<number, SkillConfig> = {
 
     //大招 
     6101: {
-        uuid:6101,name:"雷霆击",sp_name:"atk_s3",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"reds",endAnm:"",act:"max",
-        DTType:DTType.single,bck:20,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.Melee,
-        RType:RType.fixed,EType:EType.animationEnd,buffs:[],info:"释放烈焰斩击，最多命中6个敌人，造成攻击力150%的伤害，附带20%击退概率",
+        uuid:6101,name:"雷霆闪击",sp_name:"atk_s3",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"reds",endAnm:"",act:"max",
+        DTType:DTType.range,bck:20,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.Melee,
+        RType:RType.fixedEnd,EType:EType.animationEnd,buffs:[],info:"召唤巨人闪击敌人，附带20%额外暴击率",
     },
     6102: {
-        uuid:6102,name:"雷霆击",sp_name:"atk_s4",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"yellow",endAnm:"",act:"max",
-        DTType:DTType.single,crt:20,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.Melee,
-        RType:RType.fixed,EType:EType.animationEnd,buffs:[],info:"释放雷霆一击，最多命中6个敌人，造成攻击力150%的伤害，附带20%额外暴击率",
+        uuid:6102,name:"火墙",sp_name:"fire_wall",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"yellow",endAnm:"",act:"max",
+        DTType:DTType.range,ap:80,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.Melee,
+        RType:RType.fixedEnd,EType:EType.timeEnd,time:3,buffs:[],info:"召唤火墙上哨一排的敌人",
     },
     6103: {
-        uuid:6103,name:"火焰风暴",sp_name:"atk_fire",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"reds",endAnm:"",act:"max",
+        uuid:6103,name:"陨石",sp_name:"fire_yuns",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"reds",endAnm:"",act:"max",
         DTType:DTType.range,crt:20,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote,
-        RType:RType.fixed,EType:EType.animationEnd,buffs:[],info:"召唤火焰风暴，最多命中6个敌人，造成攻击力150%的范围伤害，附带20%额外暴击率",
+        RType:RType.fixedEnd,EType:EType.animationEnd,buffs:[],info:"召唤攻击敌人，造成攻击力150%的范围伤害，附带20%额外暴击率",
     },
     6104: {
         uuid:6104,name:"穿云箭",sp_name:"arrow_big_yellow",icon:"1135",TGroup:TGroup.Enemy,readyAnm:"yellow",endAnm:"",act:"max",
         DTType:DTType.single,crt:20,ap:100,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote,
-        RType:RType.bezier,EType:EType.collision,buffs:[],info:"射出强力箭矢，最多穿透6个敌人，造成攻击力100%的伤害，附带20%额外暴击率",
+        RType:RType.linear,EType:EType.collision,buffs:[],info:"射出强力箭矢，最多穿透6个敌人，附带20%额外暴击率",
     },
     6105: {
-        uuid:6105,name:"冰封领域",sp_name:"atk_fire",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"blues",endAnm:"",act:"max",
+        uuid:6105,name:"冰刺",sp_name:"ice_up",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"blues",endAnm:"",act:"max",
         DTType:DTType.range,frz:0,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote,
-        RType:RType.fixed,EType:EType.animationEnd,buffs:[],info:"释放冰封领域，最多命中6个敌人，造成攻击力150%的范围伤害",
+        RType:RType.fixedEnd,EType:EType.animationEnd,buffs:[],info:"召唤冰刺攻击一排的敌人,有概率冰冻",
     },
     6106: {
-        uuid:6106,name:"冲击波",sp_name:"atk_fire",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"reds",endAnm:"",act:"max",
-        DTType:DTType.range,bck:20,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote,
-        RType:RType.fixed,EType:EType.animationEnd,buffs:[],info:"释放冲击波，最多命中6个敌人，造成攻击力150%的范围伤害，附带20%击退概率",
+        uuid:6106,name:"冰推",sp_name:"ice_t",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"blues",endAnm:"",act:"max",
+        DTType:DTType.range,frz:0,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote,
+        RType:RType.fixed,EType:EType.animationEnd,buffs:[],info:"召唤冰墙阻挡敌人,有概率冰冻,100%击退",
     },
-   
     //============================= ======  辅助技能  ====== ========================== 
     6301:{
         uuid:6301,name:"护盾术",sp_name:"buff_wind",icon:"1255",TGroup:TGroup.Self,readyAnm:"up_blue",endAnm:"",act:"atk",
diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index 5f0f08b5..e19a1a23 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -127,15 +127,15 @@ export interface HSkillInfo {
 export const HeroInfo: Record<number, heroInfo> = {
     // ========== 近战英雄 ==========
     5001:{uuid:5001,name:"见习战士",path:"hk2", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Melee,dis:720,hp:150,ap:25,speed:800,atking:[{s_uuid:6301,t_num:2}],
-        skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,魔法盾 坦克"},
+        skills:{6101:{uuid:6101,lv:1,cd:1.5,ccd:0}},info:"近战,魔法盾 坦克"},
     5002:{uuid:5002,name:"盾骑士",path:"hk1", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Melee,dis:720,hp:150,ap:75,speed:800,atked:[{s_uuid:6301,t_num:2}],
-        skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,群体护盾 坦克"},
+        skills:{6102:{uuid:6102,lv:1,cd:1.5,ccd:0}},info:"近战,群体护盾 坦克"},
     5003:{uuid:5003,name:"战士3",path:"hk3", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Melee,dis:720,hp:100,ap:100,speed:800,
-        skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,闪击 近战dps"},
+        skills:{6103:{uuid:6103,lv:1,cd:1.5,ccd:0}},info:"近战,闪击 近战dps"},
     5004:{uuid:5004,name:"战士4",path:"hk4", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,dis:720,hp:100,ap:200,speed:800,
-        skills:{6001:{uuid:6001,lv:1,cd:0.7,ccd:0}},info:"近战,火焰击 近战dps"},
+        skills:{6104:{uuid:6104,lv:1,cd:0.7,ccd:0}},info:"近战,火焰击 近战dps"},
     5005:{uuid:5005,name:"战士5",path:"hk5", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,dis:720,hp:100,ap:200,speed:800,
-        skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"治疗近战,火焰击 近战dps"},
+        skills:{6105:{uuid:6105,lv:1,cd:1.5,ccd:0}},info:"治疗近战,火焰击 近战dps"},
 
 
     // ========== 法师英雄 ==========
diff --git a/assets/script/game/skill/SMoveSystem.ts b/assets/script/game/skill/SMoveSystem.ts
index c24b99e9..f2546955 100644
--- a/assets/script/game/skill/SMoveSystem.ts
+++ b/assets/script/game/skill/SMoveSystem.ts
@@ -115,7 +115,7 @@ export class SMoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate
                 
             case RType.fixedEnd:
                 // 固定结束位置
-                node.setPosition(moveComp.targetPos.x > 360 ? 300 : moveComp.targetPos.x, node.position.y, 0);
+                node.setPosition(moveComp.targetPos.x > 360 ? 300 : moveComp.targetPos.x, moveComp.targetPos.y, 0);
                 break;
             case RType.bezier:
                 const bezierStartPos = v3(