feat(skill): 新增fb-1、fb-2技能特效，替换原有line系列技能

1.  新增fb-1、fb-2的预制体与动画资源
2.  删除line1-line5及atk_c6旧技能资源
3.  更新SkillSet配置，将6101、6102、6103技能指向新特效
4.  调整hero_move界面的UI位置参数

assets/resources/game/skill/anm/atk/fb-1.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "line1",
+    "_name": "fb-1",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 15,
+    "sample": 14,
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.26666666666666666,
+    "_duration": 0.21428571428571427,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,25 +69,20 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.06666666666666667,
+      0.07142857142857142,
-      0.13333333333333333,
+      0.14285714285714285
-      0.2
     ],
     "_values": [
       {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@de7d0",
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@59ec8",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@a0273",
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3a170",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@eddcc",
+        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@482b5",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@55b9a",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

assets/resources/game/skill/anm/atk/fb-1.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "233b7e98-55a4-429e-9941-55177101a5ad",
+  "uuid": "45385cba-7334-4ff4-a548-578262417f58",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "line3"
+    "name": "fb-1"
   }
 }

assets/resources/game/skill/anm/atk/fb-2.anim

@@ -1,17 +1,17 @@
 [
   {
     "__type__": "cc.AnimationClip",
-    "_name": "line4",
+    "_name": "fb-2",
     "_objFlags": 0,
     "__editorExtras__": {
       "embeddedPlayerGroups": []
     },
     "_native": "",
-    "sample": 30,
+    "sample": 14,
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.26666666666666666,
+    "_duration": 0.5714285714285714,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,13 +69,13 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.03333333333333333,
+      0.07142857142857142,
-      0.06666666666666667,
+      0.14285714285714285,
-      0.1,
+      0.21428571428571427,
-      0.13333333333333333,
+      0.2857142857142857,
-      0.16666666666666666,
+      0.35714285714285715,
-      0.2,
+      0.42857142857142855,
-      0.23333333333333334
+      0.5
     ],
     "_values": [
       {

assets/resources/game/skill/anm/atk/fb-2.anim.meta

@@ -2,12 +2,12 @@
   "ver": "2.0.3",
   "importer": "animation-clip",
   "imported": true,
-  "uuid": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7",
+  "uuid": "a97c6de3-8bec-4809-8acc-18f95529cf7b",
   "files": [
     ".cconb"
   ],
   "subMetas": {},
   "userData": {
-    "name": "line1"
+    "name": "fb-2"
   }
 }

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

@@ -1,100 +0,0 @@
-[
-  {
-    "__type__": "cc.AnimationClip",
-    "_name": "line2",
-    "_objFlags": 0,
-    "__editorExtras__": {
-      "embeddedPlayerGroups": []
-    },
-    "_native": "",
-    "sample": 15,
-    "speed": 1,
-    "wrapMode": 2,
-    "enableTrsBlending": false,
-    "_duration": 0.26666666666666666,
-    "_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": "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__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@88db6",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@cd9e7",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@27569",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@cf114",
-        "__expectedType__": "cc.SpriteFrame"
-      }
-    ]
-  },
-  {
-    "__type__": "cc.AnimationClipAdditiveSettings",
-    "enabled": false,
-    "refClip": null
-  }
-]

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

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "49986def-d75d-44f8-ad5a-0a4610baed20",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "line2"
-  }
-}

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

@@ -1,100 +0,0 @@
-[
-  {
-    "__type__": "cc.AnimationClip",
-    "_name": "line3",
-    "_objFlags": 0,
-    "__editorExtras__": {
-      "embeddedPlayerGroups": []
-    },
-    "_native": "",
-    "sample": 15,
-    "speed": 1,
-    "wrapMode": 2,
-    "enableTrsBlending": false,
-    "_duration": 0.26666666666666666,
-    "_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": "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__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c85a2",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1526a",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@fa8fc",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0d06a",
-        "__expectedType__": "cc.SpriteFrame"
-      }
-    ]
-  },
-  {
-    "__type__": "cc.AnimationClipAdditiveSettings",
-    "enabled": false,
-    "refClip": null
-  }
-]

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

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "53732b1a-c114-421e-94f9-ec7c1ca70b43",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "line4"
-  }
-}

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

@@ -1,100 +0,0 @@
-[
-  {
-    "__type__": "cc.AnimationClip",
-    "_name": "line5",
-    "_objFlags": 0,
-    "__editorExtras__": {
-      "embeddedPlayerGroups": []
-    },
-    "_native": "",
-    "sample": 15,
-    "speed": 1,
-    "wrapMode": 2,
-    "enableTrsBlending": false,
-    "_duration": 0.26666666666666666,
-    "_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": "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__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@96d3b",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@4ce4d",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@21077",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@2cd64",
-        "__expectedType__": "cc.SpriteFrame"
-      }
-    ]
-  },
-  {
-    "__type__": "cc.AnimationClipAdditiveSettings",
-    "enabled": false,
-    "refClip": null
-  }
-]

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

@@ -1,13 +0,0 @@
-{
-  "ver": "2.0.3",
-  "importer": "animation-clip",
-  "imported": true,
-  "uuid": "4a4b1b65-1ed4-422c-95c2-15341ad3caf0",
-  "files": [
-    ".cconb"
-  ],
-  "subMetas": {},
-  "userData": {
-    "name": "line5"
-  }
-}

assets/resources/game/skill/atk/fb-1.prefab

@@ -0,0 +1,371 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "fb-1",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "fb-1",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_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": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0.706489444943837,
+      "w": 0.7077235789366842
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": -0.5,
+      "y": 0.5,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 89.9
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 85,
+      "height": 119
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_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__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@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__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20",
+      "__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.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 30,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+  },
+  {
+    "__type__": "57aabs7TE1J5obTAZczc+64",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "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__": 13
+    },
+    "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__": 15
+    },
+    "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": 30,
+      "height": 50
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "45385cba-7334-4ff4-a548-578262417f58",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "45385cba-7334-4ff4-a548-578262417f58",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

assets/resources/game/skill/atk/fb-1.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "d917ca59-8421-4593-9a55-0c59e08ae8fb",
+  "uuid": "81e13069-c1f8-4c50-9661-559ccefe27e3",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "atk_c6"
+    "syncNodeName": "fb-1"
   }
 }

assets/resources/game/skill/atk/fb-2.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "atk_c6",
+    "_name": "fb-2",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "atk_c6",
+    "_name": "fb-2",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -95,7 +95,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 6.77,
+      "x": 0,
       "y": 0,
       "z": 0
     },
@@ -108,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -0.6,
+      "x": -0.5,
-      "y": 0.6,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -167,13 +167,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 250,
+      "r": 255,
-      "g": 40,
+      "g": 255,
-      "b": 40,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8028",
+      "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@9a725",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -226,7 +226,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 30,
-      "height": 40
+      "height": 50
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -240,7 +240,7 @@
     "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
   },
   {
-    "__type__": "cc.Animation",
+    "__type__": "57aabs7TE1J5obTAZczc+64",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -251,42 +251,13 @@
     "__prefab": {
       "__id__": 11
     },
-    "playOnLoad": true,
+    "atk_x": 0,
-    "_clips": [
+    "atk_y": 0,
-      {
-        "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7",
-      "__expectedType__": "cc.AnimationClip"
-    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c2RDvksalG2acL3tyGCY0t"
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
-  },
-  {
-    "__type__": "57aabs7TE1J5obTAZczc+64",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 13
-    },
-    "atk_x": 10,
-    "atk_y": 15,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "60LInmZXxDtKu79AshRG9j"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -298,7 +269,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 13
     },
     "enabledContactListener": true,
     "bullet": false,
@@ -320,7 +291,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e1yBA625RLwLhzo6bLYW7j"
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
   },
   {
     "__type__": "cc.BoxCollider2D",
@@ -332,7 +303,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 15
     },
     "tag": 0,
     "_group": 1,
@@ -348,13 +319,42 @@
     "_size": {
       "__type__": "cc.Size",
       "width": 30,
-      "height": 40
+      "height": 50
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "43ZDJfXX9AX73gyytKQZWm"
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "a97c6de3-8bec-4809-8acc-18f95529cf7b",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "a97c6de3-8bec-4809-8acc-18f95529cf7b",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
   },
   {
     "__type__": "cc.PrefabInfo",

assets/resources/game/skill/atk/fb-2.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "4dc0c920-bc0e-4124-885a-2f2738e41309",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "fb-2"
+  }
+}

assets/resources/gui/element/heromove.prefab

@@ -102,8 +102,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 107.611,
+      "x": -10.648,
-      "y": 268.489,
+      "y": 63.683,
       "z": 0
     },
     "_lrot": {
@@ -481,7 +481,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 76.614,
-      "y": 215.538,
+      "y": 63.683,
       "z": 0
     },
     "_lrot": {
@@ -858,8 +858,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 139.84,
+      "x": 177.442,
-      "y": 171.929,
+      "y": 63.683,
       "z": 0
     },
     "_lrot": {
@@ -1236,8 +1236,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 76.619,
+      "x": -92.819,
-      "y": 100.445,
+      "y": 63.683,
       "z": 0
     },
     "_lrot": {
@@ -1614,7 +1614,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 124.544,
+      "x": -200.755,
       "y": 63.683,
       "z": 0
     },

assets/script/game/common/config/SkillSet.ts

@@ -211,7 +211,7 @@ export const SkillSet: Record<number, SkillConfig> = {
     **/
     6001: {
         uuid: 6001, name: "火球", sp_name: "a1", icon: "Stat_Attack_01", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
-        DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee,is_accel:true,
+        DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true,
         RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害",
     },
     6002: {
@@ -248,19 +248,19 @@ export const SkillSet: Record<number, SkillConfig> = {
      * 6104 水球  溅射：分裂多个
     **/
     6101: {
-        uuid: 6101, name: "大火球", sp_name: "line_1", icon: "Stat_FireDamage", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
+        uuid: 6101, name: "大火球", sp_name: "fb-1", icon: "Stat_FireDamage", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
         DTType: DTType.single, stun: 0, ap: 100, hit_count: 2, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote,
         RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害,一定几率暴击，高阶技能",
     },
-     //怪物法师统一使用 暗影球
+    //怪物法师统一使用 暗影球
     6102: {
-        uuid: 6102, name: "大紫球", sp_name: "line_2", icon: "Stat_Mana", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
+        uuid: 6102, name: "大紫球", sp_name: "fb-2", icon: "Stat_Mana", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
         DTType: DTType.single, ap: 100, hit_count: 2, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote,
         RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害，高阶技能",
     },
-   
+
     6103: {
-        uuid: 6103, name: "大白球", sp_name: "line_3", icon: "Stat_WaterDamage", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
+        uuid: 6103, name: "大白球", sp_name: "fb-2", icon: "Stat_WaterDamage", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
         DTType: DTType.single, ap: 100, hit_count: 2, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote,
         RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害，一定几率上毒（后期加入），高阶技能 ",
     },
@@ -413,32 +413,32 @@ export interface FieldSkillConfig {
 }
 
 export const FieldSkillSet: Record<number, FieldSkillConfig> = {
-   
 
-    7001: { uuid: 7001, name: "战后恢复", icon: "Stat_PotionBoost", type: FieldSkillType.WaveHeal, value: 0.1, info: "战斗结束生命回复量+10%" },  
-    7002: { uuid: 7002, name: "攻击加成", icon: "Stat_Attack_03", type: FieldSkillType.HeroAtk, value: 0.1, info: "英雄攻击力+10%" },         
-    7003: { uuid: 7003, name: "击晕加成", icon: "Stat_Stun_01", type: FieldSkillType.HeroStun, value: 0.1, info: "英雄击晕概率+10%" },      
-    7004: { uuid: 7004, name: "暴击加成", icon: "Stat_CriticalChance_02", type: FieldSkillType.HeroCrit, value: 0.1, info: "英雄暴击率+10%" },        
-    7005: { uuid: 7005, name: "暴伤加成", icon: "Stat_Critical_01", type: FieldSkillType.HeroCritDamage, value: 0.2, info: "英雄暴击伤害+20%" }, 
-    7006: { uuid: 7006, name: "攻速加成", icon: "Stat_AttackSpeed_02", type: FieldSkillType.HeroSpeed, value: 0.1, info: "英雄攻击速度+10%" },      
-    7007: { uuid: 7007, name: "生命加成", icon: "Stat_Hp_02", type: FieldSkillType.HeroHp, value: 0.1, info: "英雄最大生命+10%" },        
-    7008: { uuid: 7008, name: "风怒加成", icon: "Stat_CriticalComboChance", type: FieldSkillType.HeroWindFury, value: 0.1, info: "英雄风怒概率+10%" },   
-    7009: { uuid: 7009, name: "穿刺加成", icon: "Stat_Tripleshot", type: FieldSkillType.HeroPuncture, value: 0.1, info: "英雄穿刺概率+10%" },  
 
-    7010: { uuid: 7010, name: "金币收益", icon: "Stat_InventorySlotIncrease", type: FieldSkillType.WaveGold, value: 1, info: "每回合金币收益+1" },         
+    7001: { uuid: 7001, name: "战后恢复", icon: "Stat_PotionBoost", type: FieldSkillType.WaveHeal, value: 0.1, info: "战斗结束生命回复量+10%" },
-    7011: { uuid: 7011, name: "出售强化", icon: "Stat_GoldGainIncrease_01", type: FieldSkillType.SellGold, value: 1, info: "卖出英雄金币+1" }, 
+    7002: { uuid: 7002, name: "攻击加成", icon: "Stat_Attack_03", type: FieldSkillType.HeroAtk, value: 0.1, info: "英雄攻击力+10%" },
-    7012: { uuid: 7012, name: "购买优惠", icon: "Stat_KeyCapacityIncrease", type: FieldSkillType.BuyDiscount, value: 1, info: "购买卡牌费用-1金币" },   
+    7003: { uuid: 7003, name: "击晕加成", icon: "Stat_Stun_01", type: FieldSkillType.HeroStun, value: 0.1, info: "英雄击晕概率+10%" },
-    7013: { uuid: 7013, name: "刷新优惠", icon: "Stat_RandomBonus", type: FieldSkillType.RefreshDiscount, value: 1, info: "刷新卡牌费用-1金币" },  
+    7004: { uuid: 7004, name: "暴击加成", icon: "Stat_CriticalChance_02", type: FieldSkillType.HeroCrit, value: 0.1, info: "英雄暴击率+10%" },
+    7005: { uuid: 7005, name: "暴伤加成", icon: "Stat_Critical_01", type: FieldSkillType.HeroCritDamage, value: 0.2, info: "英雄暴击伤害+20%" },
+    7006: { uuid: 7006, name: "攻速加成", icon: "Stat_AttackSpeed_02", type: FieldSkillType.HeroSpeed, value: 0.1, info: "英雄攻击速度+10%" },
+    7007: { uuid: 7007, name: "生命加成", icon: "Stat_Hp_02", type: FieldSkillType.HeroHp, value: 0.1, info: "英雄最大生命+10%" },
+    7008: { uuid: 7008, name: "风怒加成", icon: "Stat_CriticalComboChance", type: FieldSkillType.HeroWindFury, value: 0.1, info: "英雄风怒概率+10%" },
+    7009: { uuid: 7009, name: "穿刺加成", icon: "Stat_Tripleshot", type: FieldSkillType.HeroPuncture, value: 0.1, info: "英雄穿刺概率+10%" },
 
-    7014: { uuid: 7014, name: "召唤强化", icon: "Stat_UnitSummonIncrease_02", type: FieldSkillType.SummonCount, value: 1, info: "召唤触发技能次数+1" },   
+    7010: { uuid: 7010, name: "金币收益", icon: "Stat_InventorySlotIncrease", type: FieldSkillType.WaveGold, value: 1, info: "每回合金币收益+1" },
-    7015: { uuid: 7015, name: "死亡强化", icon: "Stat_PoisonChanceIncrease", type: FieldSkillType.DeadCount, value: 1, info: "死亡触发技能次数+1" },     
+    7011: { uuid: 7011, name: "出售强化", icon: "Stat_GoldGainIncrease_01", type: FieldSkillType.SellGold, value: 1, info: "卖出英雄金币+1" },
-    7016: { uuid: 7016, name: "开场强化", icon: "Stat_AttackRangeIncrease_01", type: FieldSkillType.StartCount, value: 1, info: "战斗开始触发技能次数+1" },  
+    7012: { uuid: 7012, name: "购买优惠", icon: "Stat_KeyCapacityIncrease", type: FieldSkillType.BuyDiscount, value: 1, info: "购买卡牌费用-1金币" },
-    7017: { uuid: 7017, name: "结束强化", icon: "Stat_UnitSummonIncrease_01", type: FieldSkillType.EndCount, value: 1, info: "战斗结束触发技能次数+1" },    
+    7013: { uuid: 7013, name: "刷新优惠", icon: "Stat_RandomBonus", type: FieldSkillType.RefreshDiscount, value: 1, info: "刷新卡牌费用-1金币" },
-    7018: { uuid: 7018, name: "攻击强化", icon: "Stat_Attack_03", type: FieldSkillType.AtkCount, value: 1, info: "攻击触发技能次数+1" },     
+
-    7019: { uuid: 7019, name: "受击强化", icon: "Stat_Armor_01", type: FieldSkillType.BeAtkCount, value: 1, info: "被攻击触发技能次数+1" },  
+    7014: { uuid: 7014, name: "召唤强化", icon: "Stat_UnitSummonIncrease_02", type: FieldSkillType.SummonCount, value: 1, info: "召唤触发技能次数+1" },
+    7015: { uuid: 7015, name: "死亡强化", icon: "Stat_PoisonChanceIncrease", type: FieldSkillType.DeadCount, value: 1, info: "死亡触发技能次数+1" },
+    7016: { uuid: 7016, name: "开场强化", icon: "Stat_AttackRangeIncrease_01", type: FieldSkillType.StartCount, value: 1, info: "战斗开始触发技能次数+1" },
+    7017: { uuid: 7017, name: "结束强化", icon: "Stat_UnitSummonIncrease_01", type: FieldSkillType.EndCount, value: 1, info: "战斗结束触发技能次数+1" },
+    7018: { uuid: 7018, name: "攻击强化", icon: "Stat_Attack_03", type: FieldSkillType.AtkCount, value: 1, info: "攻击触发技能次数+1" },
+    7019: { uuid: 7019, name: "受击强化", icon: "Stat_Armor_01", type: FieldSkillType.BeAtkCount, value: 1, info: "被攻击触发技能次数+1" },
 
     // ============ wave5 档（原值 ×2） ============
-  
+
     7201: { uuid: 7201, name: "战后恢复+", icon: "Stat_PotionBoost", type: FieldSkillType.WaveHeal, value: 0.2, info: "战斗结束生命回复量+20%" },
     7202: { uuid: 7202, name: "攻击加成+", icon: "Stat_Attack_03", type: FieldSkillType.HeroAtk, value: 0.2, info: "英雄攻击力+20%" },
     7203: { uuid: 7203, name: "击晕加成+", icon: "Stat_Stun_01", type: FieldSkillType.HeroStun, value: 0.2, info: "英雄击晕概率+20%" },
@@ -455,7 +455,7 @@ export const FieldSkillSet: Record<number, FieldSkillConfig> = {
     7212: { uuid: 7212, name: "购买优惠+", icon: "Stat_KeyCapacityIncrease", type: FieldSkillType.BuyDiscount, value: 2, info: "购买卡牌费用-2金币" },
     7213: { uuid: 7213, name: "刷新优惠+", icon: "Stat_RandomBonus", type: FieldSkillType.RefreshDiscount, value: 2, info: "刷新卡牌费用-2金币" },
 
-  
+
 
     7401: { uuid: 7401, name: "战后恢复++", icon: "Stat_PotionBoost", type: FieldSkillType.WaveHeal, value: 0.3, info: "战斗结束生命回复量+30%" },
     7402: { uuid: 7402, name: "攻击加成++", icon: "Stat_Attack_03", type: FieldSkillType.HeroAtk, value: 0.3, info: "英雄攻击力+30%" },
@@ -467,7 +467,7 @@ export const FieldSkillSet: Record<number, FieldSkillConfig> = {
     7408: { uuid: 7408, name: "风怒加成++", icon: "Stat_CriticalComboChance", type: FieldSkillType.HeroWindFury, value: 0.3, info: "英雄风怒概率+30%" },
     7409: { uuid: 7409, name: "穿刺加成++", icon: "Stat_Tripleshot", type: FieldSkillType.HeroPuncture, value: 0.3, info: "英雄穿刺概率+30%" },
 
-    
+
     7410: { uuid: 7410, name: "金币收益++", icon: "Stat_InventorySlotIncrease", type: FieldSkillType.WaveGold, value: 3, info: "每回合金币收益+3" },
     7411: { uuid: 7411, name: "出售强化++", icon: "Stat_GoldGainIncrease_01", type: FieldSkillType.SellGold, value: 3, info: "卖出英雄金币+3" },
     7412: { uuid: 7412, name: "购买优惠++", icon: "Stat_KeyCapacityIncrease", type: FieldSkillType.BuyDiscount, value: 3, info: "购买卡牌费用-3金币" },