diff --git a/assets/bundles/battleGame/prefab/textGrid.prefab b/assets/bundles/battleGame/prefab/textGrid.prefab
index e2d0289..79be936 100644
--- a/assets/bundles/battleGame/prefab/textGrid.prefab
+++ b/assets/bundles/battleGame/prefab/textGrid.prefab
@@ -667,7 +667,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "63c3559c-ff6d-439e-ae2e-bb17ffa60f04",
+      "__uuid__": "92bf30d8-bc81-4826-8b8c-c9b5b9dcc2fd",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "土",
@@ -1075,11 +1075,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "ee9c0c4b-851f-4f02-beb6-c3b719e3fa9d",
+      "__uuid__": "95f5d4e0-f589-4e29-8f31-6483e457efcf",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "土",
-    "defaultAnimation": "待机",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -1211,11 +1211,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "90700d70-3da1-40c0-9671-51f002407bc3",
+      "__uuid__": "2cec1a4c-5d6f-45f4-b432-f59ac52a3e0c",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "土",
-    "defaultAnimation": "待机",
+    "defaultAnimation": "",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
diff --git a/assets/bundles/battleGame/prefab/格子锁.prefab b/assets/bundles/battleGame/prefab/格子锁.prefab
new file mode 100644
index 0000000..2f43a53
--- /dev/null
+++ b/assets/bundles/battleGame/prefab/格子锁.prefab
@@ -0,0 +1,490 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "格子锁",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "格子锁",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_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": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "锁定",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -17.1845703125,
+      "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": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 42,
+      "height": 45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "52BfiQtHBLk5IrGlqyFIeP"
+  },
+  {
+    "__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__": "201e9a69-4d94-4182-b893-c972f15ee76e@f9941",
+      "__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": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "50cCFcSOJGPbVuqJkpsr7c"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "39f4GsgNtNsq8/wCLq3tPA",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "num",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 12.5,
+      "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": 33554432,
+    "_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": 37.369140625,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a7rWzpiMxPDrFoMqw0xD9h"
+  },
+  {
+    "__type__": "cc.Label",
+    "_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
+    },
+    "_string": "32",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 30,
+    "_fontSize": 30,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": true,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 213,
+      "g": 123,
+      "b": 85,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b8MyhW1LFDR7LJQVwPdPvM"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "a0kjvwE+JJI7QzpIQAs4CB",
+    "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": 82.369140625,
+      "height": 68
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "85sTDvKSNMXZkiAHpfcCpx"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "0b9461e4-38ea-4e13-b133-f28d07bc5178@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "715KNuSXlNAabmEpf0YdgP"
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_resizeMode": 1,
+    "_layoutType": 1,
+    "_cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_startAxis": 0,
+    "_paddingLeft": 3,
+    "_paddingRight": 10,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": -10,
+    "_spacingY": 0,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 0,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "acA5MrJQNI66W+fTtjgwyu"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "a01BJWthhKbr3LbCXP7YXR",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/assets/bundles/battleGame/prefab/格子锁.prefab.meta b/assets/bundles/battleGame/prefab/格子锁.prefab.meta
new file mode 100644
index 0000000..6482f80
--- /dev/null
+++ b/assets/bundles/battleGame/prefab/格子锁.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "f1878340-181d-4769-a195-bd78eb315b3e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "格子锁"
+  }
+}
diff --git a/assets/bundles/first/config/Hero.json b/assets/bundles/first/config/Hero.json
index c480552..cc1c5c6 100644
--- a/assets/bundles/first/config/Hero.json
+++ b/assets/bundles/first/config/Hero.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": 1001,
+        "id": 101,
         "name": "金1",
         "type": 1,
         "herotype": 1,
@@ -11,7 +11,7 @@
         "res": "金1",
         "number": 1,
         "level": 1,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 1,
@@ -20,11 +20,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10101
+        ],
         "act_skill": []
     },
     {
-        "id": 1002,
+        "id": 102,
         "name": "金2",
         "type": 1,
         "herotype": 1,
@@ -44,11 +46,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10101
+        ],
         "act_skill": []
     },
     {
-        "id": 1003,
+        "id": 103,
         "name": "金4",
         "type": 1,
         "herotype": 1,
@@ -68,11 +72,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10101
+        ],
         "act_skill": []
     },
     {
-        "id": 1004,
+        "id": 104,
         "name": "金8",
         "type": 1,
         "herotype": 1,
@@ -83,7 +89,7 @@
         "res": "金8",
         "number": 8,
         "level": 4,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 8,
@@ -92,11 +98,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10102
+        ],
         "act_skill": []
     },
     {
-        "id": 1005,
+        "id": 105,
         "name": "金16",
         "type": 1,
         "herotype": 1,
@@ -116,11 +124,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10102
+        ],
         "act_skill": []
     },
     {
-        "id": 1006,
+        "id": 106,
         "name": "金32",
         "type": 1,
         "herotype": 1,
@@ -140,11 +150,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10102
+        ],
         "act_skill": []
     },
     {
-        "id": 1007,
+        "id": 107,
         "name": "金64",
         "type": 1,
         "herotype": 1,
@@ -155,7 +167,7 @@
         "res": "金64",
         "number": 64,
         "level": 7,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 64,
@@ -164,11 +176,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10103
+        ],
         "act_skill": []
     },
     {
-        "id": 1008,
+        "id": 108,
         "name": "金128",
         "type": 1,
         "herotype": 1,
@@ -188,11 +202,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10103
+        ],
         "act_skill": []
     },
     {
-        "id": 1009,
+        "id": 109,
         "name": "金256",
         "type": 1,
         "herotype": 1,
@@ -212,11 +228,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10103
+        ],
         "act_skill": []
     },
     {
-        "id": 1010,
+        "id": 110,
         "name": "金512",
         "type": 1,
         "herotype": 1,
@@ -227,7 +245,7 @@
         "res": "金512",
         "number": 512,
         "level": 10,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 512,
@@ -236,11 +254,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10104
+        ],
         "act_skill": []
     },
     {
-        "id": 1011,
+        "id": 111,
         "name": "金1024",
         "type": 1,
         "herotype": 1,
@@ -260,11 +280,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10104
+        ],
         "act_skill": []
     },
     {
-        "id": 1012,
+        "id": 112,
         "name": "金2048",
         "type": 1,
         "herotype": 1,
@@ -275,7 +297,7 @@
         "res": "金2048",
         "number": 2048,
         "level": 12,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 2048,
@@ -284,11 +306,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            10105
+        ],
         "act_skill": []
     },
     {
-        "id": 1101,
+        "id": 201,
         "name": "木1",
         "type": 1,
         "herotype": 2,
@@ -299,7 +323,7 @@
         "res": "木1",
         "number": 1,
         "level": 1,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 1,
@@ -308,11 +332,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20101
+        ],
         "act_skill": []
     },
     {
-        "id": 1102,
+        "id": 202,
         "name": "木2",
         "type": 1,
         "herotype": 2,
@@ -332,11 +358,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20101
+        ],
         "act_skill": []
     },
     {
-        "id": 1103,
+        "id": 203,
         "name": "木4",
         "type": 1,
         "herotype": 2,
@@ -356,11 +384,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20101
+        ],
         "act_skill": []
     },
     {
-        "id": 1104,
+        "id": 204,
         "name": "木8",
         "type": 1,
         "herotype": 2,
@@ -371,7 +401,7 @@
         "res": "木8",
         "number": 8,
         "level": 4,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 8,
@@ -380,11 +410,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20102
+        ],
         "act_skill": []
     },
     {
-        "id": 1105,
+        "id": 205,
         "name": "木16",
         "type": 1,
         "herotype": 2,
@@ -404,11 +436,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20102
+        ],
         "act_skill": []
     },
     {
-        "id": 1106,
+        "id": 206,
         "name": "木32",
         "type": 1,
         "herotype": 2,
@@ -428,11 +462,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20102
+        ],
         "act_skill": []
     },
     {
-        "id": 1107,
+        "id": 207,
         "name": "木64",
         "type": 1,
         "herotype": 2,
@@ -443,7 +479,7 @@
         "res": "木64",
         "number": 64,
         "level": 7,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 64,
@@ -452,11 +488,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20103
+        ],
         "act_skill": []
     },
     {
-        "id": 1108,
+        "id": 208,
         "name": "木128",
         "type": 1,
         "herotype": 2,
@@ -476,11 +514,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20103
+        ],
         "act_skill": []
     },
     {
-        "id": 1109,
+        "id": 209,
         "name": "木256",
         "type": 1,
         "herotype": 2,
@@ -500,11 +540,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20103
+        ],
         "act_skill": []
     },
     {
-        "id": 1110,
+        "id": 210,
         "name": "木512",
         "type": 1,
         "herotype": 2,
@@ -515,7 +557,7 @@
         "res": "木512",
         "number": 512,
         "level": 10,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 512,
@@ -524,11 +566,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20104
+        ],
         "act_skill": []
     },
     {
-        "id": 1111,
+        "id": 211,
         "name": "木1024",
         "type": 1,
         "herotype": 2,
@@ -548,11 +592,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20104
+        ],
         "act_skill": []
     },
     {
-        "id": 1112,
+        "id": 212,
         "name": "木2048",
         "type": 1,
         "herotype": 2,
@@ -563,7 +609,7 @@
         "res": "木2048",
         "number": 2048,
         "level": 12,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 2048,
@@ -572,11 +618,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            20105
+        ],
         "act_skill": []
     },
     {
-        "id": 201,
+        "id": 301,
         "name": "水1",
         "type": 2,
         "herotype": 3,
@@ -587,7 +635,7 @@
         "res": "水1",
         "number": 1,
         "level": 1,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 1,
@@ -596,11 +644,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30101
+        ],
         "act_skill": []
     },
     {
-        "id": 202,
+        "id": 302,
         "name": "水2",
         "type": 2,
         "herotype": 3,
@@ -620,11 +670,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30101
+        ],
         "act_skill": []
     },
     {
-        "id": 203,
+        "id": 303,
         "name": "水4",
         "type": 2,
         "herotype": 3,
@@ -644,11 +696,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30101
+        ],
         "act_skill": []
     },
     {
-        "id": 204,
+        "id": 304,
         "name": "水8",
         "type": 2,
         "herotype": 3,
@@ -659,7 +713,7 @@
         "res": "水8",
         "number": 8,
         "level": 4,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 8,
@@ -668,11 +722,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30102
+        ],
         "act_skill": []
     },
     {
-        "id": 205,
+        "id": 305,
         "name": "水16",
         "type": 2,
         "herotype": 3,
@@ -692,11 +748,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30102
+        ],
         "act_skill": []
     },
     {
-        "id": 206,
+        "id": 306,
         "name": "水32",
         "type": 2,
         "herotype": 3,
@@ -716,11 +774,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30102
+        ],
         "act_skill": []
     },
     {
-        "id": 207,
+        "id": 307,
         "name": "水64",
         "type": 2,
         "herotype": 3,
@@ -731,7 +791,7 @@
         "res": "水64",
         "number": 64,
         "level": 7,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 64,
@@ -740,11 +800,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30103
+        ],
         "act_skill": []
     },
     {
-        "id": 208,
+        "id": 308,
         "name": "水128",
         "type": 2,
         "herotype": 3,
@@ -764,11 +826,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30103
+        ],
         "act_skill": []
     },
     {
-        "id": 209,
+        "id": 309,
         "name": "水256",
         "type": 2,
         "herotype": 3,
@@ -788,11 +852,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30103
+        ],
         "act_skill": []
     },
     {
-        "id": 210,
+        "id": 310,
         "name": "水512",
         "type": 2,
         "herotype": 3,
@@ -803,7 +869,7 @@
         "res": "水512",
         "number": 512,
         "level": 10,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 512,
@@ -812,11 +878,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30104
+        ],
         "act_skill": []
     },
     {
-        "id": 211,
+        "id": 311,
         "name": "水1024",
         "type": 2,
         "herotype": 3,
@@ -836,11 +904,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30104
+        ],
         "act_skill": []
     },
     {
-        "id": 212,
+        "id": 312,
         "name": "水2048",
         "type": 2,
         "herotype": 3,
@@ -851,7 +921,7 @@
         "res": "水2048",
         "number": 2048,
         "level": 12,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 2048,
@@ -860,11 +930,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            30105
+        ],
         "act_skill": []
     },
     {
-        "id": 301,
+        "id": 401,
         "name": "火1",
         "type": 2,
         "herotype": 4,
@@ -875,7 +947,7 @@
         "res": "火1",
         "number": 1,
         "level": 1,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 1,
@@ -884,11 +956,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40101
+        ],
         "act_skill": []
     },
     {
-        "id": 302,
+        "id": 402,
         "name": "火2",
         "type": 2,
         "herotype": 4,
@@ -908,11 +982,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40101
+        ],
         "act_skill": []
     },
     {
-        "id": 303,
+        "id": 403,
         "name": "火4",
         "type": 2,
         "herotype": 4,
@@ -932,11 +1008,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40101
+        ],
         "act_skill": []
     },
     {
-        "id": 304,
+        "id": 404,
         "name": "火8",
         "type": 2,
         "herotype": 4,
@@ -947,7 +1025,7 @@
         "res": "火8",
         "number": 8,
         "level": 4,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 8,
@@ -956,11 +1034,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40102
+        ],
         "act_skill": []
     },
     {
-        "id": 305,
+        "id": 405,
         "name": "火16",
         "type": 2,
         "herotype": 4,
@@ -980,11 +1060,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40102
+        ],
         "act_skill": []
     },
     {
-        "id": 306,
+        "id": 406,
         "name": "火32",
         "type": 2,
         "herotype": 4,
@@ -1004,11 +1086,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40102
+        ],
         "act_skill": []
     },
     {
-        "id": 307,
+        "id": 407,
         "name": "火64",
         "type": 2,
         "herotype": 4,
@@ -1019,7 +1103,7 @@
         "res": "火64",
         "number": 64,
         "level": 7,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 64,
@@ -1028,11 +1112,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40103
+        ],
         "act_skill": []
     },
     {
-        "id": 308,
+        "id": 408,
         "name": "火128",
         "type": 2,
         "herotype": 4,
@@ -1052,11 +1138,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40103
+        ],
         "act_skill": []
     },
     {
-        "id": 309,
+        "id": 409,
         "name": "火256",
         "type": 2,
         "herotype": 4,
@@ -1076,11 +1164,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40103
+        ],
         "act_skill": []
     },
     {
-        "id": 310,
+        "id": 410,
         "name": "火512",
         "type": 2,
         "herotype": 4,
@@ -1091,7 +1181,7 @@
         "res": "火512",
         "number": 512,
         "level": 10,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 512,
@@ -1100,11 +1190,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40104
+        ],
         "act_skill": []
     },
     {
-        "id": 311,
+        "id": 411,
         "name": "火1024",
         "type": 2,
         "herotype": 4,
@@ -1124,11 +1216,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40104
+        ],
         "act_skill": []
     },
     {
-        "id": 312,
+        "id": 412,
         "name": "火2048",
         "type": 2,
         "herotype": 4,
@@ -1139,7 +1233,7 @@
         "res": "火2048",
         "number": 2048,
         "level": 12,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 2048,
@@ -1148,11 +1242,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            40105
+        ],
         "act_skill": []
     },
     {
-        "id": 401,
+        "id": 501,
         "name": "土1",
         "type": 1,
         "herotype": 5,
@@ -1163,7 +1259,7 @@
         "res": "土1",
         "number": 1,
         "level": 1,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 1,
@@ -1172,11 +1268,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50101
+        ],
         "act_skill": []
     },
     {
-        "id": 402,
+        "id": 502,
         "name": "土2",
         "type": 1,
         "herotype": 5,
@@ -1196,11 +1294,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50101
+        ],
         "act_skill": []
     },
     {
-        "id": 403,
+        "id": 503,
         "name": "土4",
         "type": 1,
         "herotype": 5,
@@ -1220,11 +1320,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50101
+        ],
         "act_skill": []
     },
     {
-        "id": 404,
+        "id": 504,
         "name": "土8",
         "type": 1,
         "herotype": 5,
@@ -1235,7 +1337,7 @@
         "res": "土8",
         "number": 8,
         "level": 4,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 8,
@@ -1244,11 +1346,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50102
+        ],
         "act_skill": []
     },
     {
-        "id": 405,
+        "id": 505,
         "name": "土16",
         "type": 1,
         "herotype": 5,
@@ -1268,11 +1372,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50102
+        ],
         "act_skill": []
     },
     {
-        "id": 406,
+        "id": 506,
         "name": "土32",
         "type": 1,
         "herotype": 5,
@@ -1292,11 +1398,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50102
+        ],
         "act_skill": []
     },
     {
-        "id": 407,
+        "id": 507,
         "name": "土64",
         "type": 1,
         "herotype": 5,
@@ -1307,7 +1415,7 @@
         "res": "土64",
         "number": 64,
         "level": 7,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 64,
@@ -1316,11 +1424,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50103
+        ],
         "act_skill": []
     },
     {
-        "id": 408,
+        "id": 508,
         "name": "土128",
         "type": 1,
         "herotype": 5,
@@ -1340,11 +1450,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50103
+        ],
         "act_skill": []
     },
     {
-        "id": 409,
+        "id": 509,
         "name": "土256",
         "type": 1,
         "herotype": 5,
@@ -1364,11 +1476,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50103
+        ],
         "act_skill": []
     },
     {
-        "id": 410,
+        "id": 510,
         "name": "土512",
         "type": 1,
         "herotype": 5,
@@ -1379,7 +1493,7 @@
         "res": "土512",
         "number": 512,
         "level": 10,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 512,
@@ -1388,11 +1502,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50104
+        ],
         "act_skill": []
     },
     {
-        "id": 411,
+        "id": 511,
         "name": "土1024",
         "type": 1,
         "herotype": 5,
@@ -1412,11 +1528,13 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50104
+        ],
         "act_skill": []
     },
     {
-        "id": 412,
+        "id": 512,
         "name": "土2048",
         "type": 1,
         "herotype": 5,
@@ -1427,7 +1545,7 @@
         "res": "土2048",
         "number": 2048,
         "level": 12,
-        "startweapon": 0,
+        "startweapon": 1,
         "personalweapon": 0,
         "exp": [],
         "atk": 2048,
@@ -1436,7 +1554,9 @@
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
-        "atk_id": [],
+        "atk_id": [
+            50105
+        ],
         "act_skill": []
     }
 ]
\ No newline at end of file
diff --git a/assets/bundles/first/config/Rank.json b/assets/bundles/first/config/Rank.json
index 00e46d4..4c7df04 100644
--- a/assets/bundles/first/config/Rank.json
+++ b/assets/bundles/first/config/Rank.json
@@ -1,7 +1,7 @@
 [
     {
         "id": 1,
-        "name": "凡修·初阶",
+        "name": "幼儿园小班·上",
         "icon": "凡修·初阶",
         "level": [
             1,
@@ -34,7 +34,7 @@
     },
     {
         "id": 2,
-        "name": "凡修·中阶",
+        "name": "幼儿园小班·下",
         "icon": "凡修·中阶",
         "level": [
             6,
@@ -67,7 +67,7 @@
     },
     {
         "id": 3,
-        "name": "凡修·高阶",
+        "name": "幼儿园中班·上",
         "icon": "凡修·高阶",
         "level": [
             11,
@@ -100,7 +100,7 @@
     },
     {
         "id": 4,
-        "name": "凡修·圆满",
+        "name": "幼儿园中班·下",
         "icon": "凡修·圆满",
         "level": [
             16,
@@ -133,7 +133,7 @@
     },
     {
         "id": 5,
-        "name": "人仙·初阶",
+        "name": "幼儿园大班·上",
         "icon": "人仙·初阶",
         "level": [
             21,
@@ -166,7 +166,7 @@
     },
     {
         "id": 6,
-        "name": "人仙·中阶",
+        "name": "幼儿园大班·下",
         "icon": "人仙·中阶",
         "level": [
             26,
@@ -200,7 +200,7 @@
     },
     {
         "id": 7,
-        "name": "人仙·高阶",
+        "name": "小学一年级·上",
         "icon": "人仙·高阶",
         "level": [
             31,
@@ -234,7 +234,7 @@
     },
     {
         "id": 8,
-        "name": "人仙·圆满",
+        "name": "小学一年级·下",
         "icon": "人仙·圆满",
         "level": [
             36,
@@ -268,7 +268,7 @@
     },
     {
         "id": 9,
-        "name": "地仙·初阶",
+        "name": "小学二年级·上",
         "icon": "地仙·初阶",
         "level": [
             41,
@@ -302,7 +302,7 @@
     },
     {
         "id": 10,
-        "name": "地仙·中阶",
+        "name": "小学二年级·下",
         "icon": "地仙·中阶",
         "level": [
             46,
@@ -336,7 +336,7 @@
     },
     {
         "id": 11,
-        "name": "地仙·高阶",
+        "name": "小学三年级·上",
         "icon": "地仙·高阶",
         "level": [
             51,
@@ -371,7 +371,7 @@
     },
     {
         "id": 12,
-        "name": "地仙·圆满",
+        "name": "小学三年级·下",
         "icon": "地仙·圆满",
         "level": [
             56,
@@ -406,7 +406,7 @@
     },
     {
         "id": 13,
-        "name": "天仙·初阶",
+        "name": "小学四年级·上",
         "icon": "天仙·初阶",
         "level": [
             61,
@@ -441,7 +441,7 @@
     },
     {
         "id": 14,
-        "name": "天仙·中阶",
+        "name": "小学四年级·下",
         "icon": "天仙·中阶",
         "level": [
             66,
@@ -476,7 +476,7 @@
     },
     {
         "id": 15,
-        "name": "天仙·高阶",
+        "name": "小学五年级·上",
         "icon": "天仙·高阶",
         "level": [
             71,
@@ -511,7 +511,7 @@
     },
     {
         "id": 16,
-        "name": "天仙·圆满",
+        "name": "小学五年级·下",
         "icon": "天仙·圆满",
         "level": [
             76,
@@ -546,7 +546,7 @@
     },
     {
         "id": 17,
-        "name": "真仙·初阶",
+        "name": "小学六年级·上",
         "icon": "真仙·初阶",
         "level": [
             81,
@@ -581,7 +581,7 @@
     },
     {
         "id": 18,
-        "name": "真仙·中阶",
+        "name": "小学六年级·下",
         "icon": "真仙·中阶",
         "level": [
             86,
@@ -616,7 +616,7 @@
     },
     {
         "id": 19,
-        "name": "真仙·高阶",
+        "name": "初中一年级·上",
         "icon": "真仙·高阶",
         "level": [
             91,
@@ -651,7 +651,7 @@
     },
     {
         "id": 20,
-        "name": "真仙·圆满",
+        "name": "初中一年级·下",
         "icon": "真仙·圆满",
         "level": [
             96,
@@ -686,7 +686,7 @@
     },
     {
         "id": 21,
-        "name": "玄仙·初阶",
+        "name": "初中二年级·上",
         "icon": "玄仙·初阶",
         "level": [
             101,
@@ -721,7 +721,7 @@
     },
     {
         "id": 22,
-        "name": "玄仙·中阶",
+        "name": "初中二年级·下",
         "icon": "玄仙·中阶",
         "level": [
             106,
@@ -756,7 +756,7 @@
     },
     {
         "id": 23,
-        "name": "玄仙·高阶",
+        "name": "初中三年级·上",
         "icon": "玄仙·高阶",
         "level": [
             111,
@@ -791,7 +791,7 @@
     },
     {
         "id": 24,
-        "name": "玄仙·圆满",
+        "name": "初中三年级·下",
         "icon": "玄仙·圆满",
         "level": [
             116,
@@ -826,7 +826,7 @@
     },
     {
         "id": 25,
-        "name": "金仙·初阶",
+        "name": "高中一年级·上",
         "icon": "金仙·初阶",
         "level": [
             121,
@@ -861,7 +861,7 @@
     },
     {
         "id": 26,
-        "name": "金仙·中阶",
+        "name": "高中一年级·下",
         "icon": "金仙·中阶",
         "level": [
             126,
@@ -896,7 +896,7 @@
     },
     {
         "id": 27,
-        "name": "金仙·高阶",
+        "name": "高中二年级·上",
         "icon": "金仙·高阶",
         "level": [
             131,
@@ -931,7 +931,7 @@
     },
     {
         "id": 28,
-        "name": "金仙·圆满",
+        "name": "高中二年级·下",
         "icon": "金仙·圆满",
         "level": [
             136,
@@ -966,7 +966,7 @@
     },
     {
         "id": 29,
-        "name": "太乙·初阶",
+        "name": "高中三年级·上",
         "icon": "太乙·初阶",
         "level": [
             141,
@@ -1001,7 +1001,7 @@
     },
     {
         "id": 30,
-        "name": "太乙·中阶",
+        "name": "高中三年级·下",
         "icon": "太乙·中阶",
         "level": [
             146,
@@ -1036,7 +1036,7 @@
     },
     {
         "id": 31,
-        "name": "太乙·高阶",
+        "name": "大一·上",
         "icon": "太乙·高阶",
         "level": [
             151,
@@ -1071,7 +1071,7 @@
     },
     {
         "id": 32,
-        "name": "太乙·圆满",
+        "name": "大一·下",
         "icon": "太乙·圆满",
         "level": [
             156,
@@ -1106,7 +1106,7 @@
     },
     {
         "id": 33,
-        "name": "大罗·初阶",
+        "name": "大二·上",
         "icon": "大罗·初阶",
         "level": [
             161,
@@ -1141,7 +1141,7 @@
     },
     {
         "id": 34,
-        "name": "大罗·中阶",
+        "name": "大二·下",
         "icon": "大罗·中阶",
         "level": [
             166,
@@ -1176,7 +1176,7 @@
     },
     {
         "id": 35,
-        "name": "大罗·高阶",
+        "name": "大三·上",
         "icon": "大罗·高阶",
         "level": [
             171,
@@ -1211,7 +1211,7 @@
     },
     {
         "id": 36,
-        "name": "大罗·圆满",
+        "name": "大三·下",
         "icon": "大罗·圆满",
         "level": [
             176,
@@ -1246,7 +1246,7 @@
     },
     {
         "id": 37,
-        "name": "混元·初阶",
+        "name": "大四·上",
         "icon": "混元·初阶",
         "level": [
             181,
@@ -1281,7 +1281,7 @@
     },
     {
         "id": 38,
-        "name": "混元·中阶",
+        "name": "大四·下",
         "icon": "混元·中阶",
         "level": [
             186,
@@ -1316,7 +1316,7 @@
     },
     {
         "id": 39,
-        "name": "混元·高阶",
+        "name": "硕士一年级·上",
         "icon": "混元·高阶",
         "level": [
             191,
@@ -1351,7 +1351,7 @@
     },
     {
         "id": 40,
-        "name": "混元·圆满",
+        "name": "硕士一年级·下",
         "icon": "混元·圆满",
         "level": [
             196,
@@ -1386,7 +1386,7 @@
     },
     {
         "id": 41,
-        "name": "合道·初阶",
+        "name": "硕士二年级·上",
         "icon": "合道·初阶",
         "level": [
             201,
@@ -1421,7 +1421,7 @@
     },
     {
         "id": 42,
-        "name": "合道·中阶",
+        "name": "硕士二年级·下",
         "icon": "合道·中阶",
         "level": [
             206,
@@ -1456,7 +1456,7 @@
     },
     {
         "id": 43,
-        "name": "合道·高阶",
+        "name": "硕士三年级·上",
         "icon": "合道·高阶",
         "level": [
             211,
@@ -1491,7 +1491,7 @@
     },
     {
         "id": 44,
-        "name": "合道·圆满",
+        "name": "硕士三年级·下",
         "icon": "合道·圆满",
         "level": [
             216,
@@ -1526,7 +1526,7 @@
     },
     {
         "id": 45,
-        "name": "太初",
+        "name": "博士一年级·上",
         "icon": "太初",
         "level": [
             221,
@@ -1558,5 +1558,261 @@
             8,
             9
         ]
+    },
+    {
+        "id": 46,
+        "name": "博士一年级·下",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 47,
+        "name": "博士二年级·上",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 48,
+        "name": "博士二年级·下",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 49,
+        "name": "博士三年级·上",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 50,
+        "name": "博士三年级·下",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 51,
+        "name": "博士四年级·上",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 52,
+        "name": "博士四年级·下",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 53,
+        "name": "博士五年级·上",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 54,
+        "name": "博士五年级·下",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 55,
+        "name": "讲师初阶",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 56,
+        "name": "讲师初阶",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 57,
+        "name": "讲师中阶",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 58,
+        "name": "讲师中阶",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 59,
+        "name": "讲师高阶",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 60,
+        "name": "讲师高阶",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
+    },
+    {
+        "id": 61,
+        "name": "教授",
+        "icon": "太初",
+        "level": [],
+        "reward": "",
+        "levelvalue": 0,
+        "diffcult": 0,
+        "weapondrop": 0,
+        "weaponweight": [],
+        "aiweapon": "",
+        "aiusead": 0,
+        "aiusechanzi": [],
+        "aiusetext": [],
+        "charactersweight": []
     }
 ]
\ No newline at end of file
diff --git a/assets/bundles/first/config/Skill.json b/assets/bundles/first/config/Skill.json
index e4ae7ad..bd9ce94 100644
--- a/assets/bundles/first/config/Skill.json
+++ b/assets/bundles/first/config/Skill.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": 100001,
+        "id": 10101,
         "name": "",
         "desc": "剑劈砍",
         "icon": "",
@@ -22,7 +22,7 @@
         "result": ""
     },
     {
-        "id": 100002,
+        "id": 10102,
         "name": "",
         "desc": "扇形攻击",
         "icon": "",
@@ -44,7 +44,7 @@
         "result": ""
     },
     {
-        "id": 100003,
+        "id": 10103,
         "name": "",
         "desc": "扇形二连击",
         "icon": "",
@@ -66,7 +66,7 @@
         "result": ""
     },
     {
-        "id": 100004,
+        "id": 10104,
         "name": "",
         "desc": "连击带击退",
         "icon": "",
@@ -88,7 +88,7 @@
         "result": ""
     },
     {
-        "id": 100005,
+        "id": 10105,
         "name": "",
         "desc": "扇形3连击",
         "icon": "",
@@ -110,7 +110,7 @@
         "result": ""
     },
     {
-        "id": 200001,
+        "id": 20101,
         "name": "",
         "desc": "抡一圈",
         "icon": "",
@@ -132,7 +132,7 @@
         "result": ""
     },
     {
-        "id": 200002,
+        "id": 20102,
         "name": "",
         "desc": "抡2圈",
         "icon": "",
@@ -154,7 +154,7 @@
         "result": ""
     },
     {
-        "id": 200003,
+        "id": 20103,
         "name": "",
         "desc": "抡2圈，概率眩晕",
         "icon": "",
@@ -176,7 +176,7 @@
         "result": ""
     },
     {
-        "id": 200004,
+        "id": 20104,
         "name": "",
         "desc": "携带青龙影子，扩大攻击范围",
         "icon": "",
@@ -198,7 +198,7 @@
         "result": ""
     },
     {
-        "id": 200005,
+        "id": 20105,
         "name": "",
         "desc": "额外飞出龙影攻击",
         "icon": "",
@@ -220,7 +220,7 @@
         "result": ""
     },
     {
-        "id": 300001,
+        "id": 30101,
         "name": "",
         "desc": "水球术",
         "icon": "",
@@ -242,7 +242,7 @@
         "result": ""
     },
     {
-        "id": 300002,
+        "id": 30102,
         "name": "",
         "desc": "连发",
         "icon": "",
@@ -264,7 +264,7 @@
         "result": ""
     },
     {
-        "id": 300003,
+        "id": 30103,
         "name": "",
         "desc": "三连发",
         "icon": "",
@@ -286,7 +286,7 @@
         "result": ""
     },
     {
-        "id": 300004,
+        "id": 30104,
         "name": "",
         "desc": "4连发",
         "icon": "",
@@ -308,7 +308,7 @@
         "result": ""
     },
     {
-        "id": 300005,
+        "id": 30105,
         "name": "",
         "desc": "5连发",
         "icon": "",
@@ -330,7 +330,7 @@
         "result": ""
     },
     {
-        "id": 400001,
+        "id": 40101,
         "name": "",
         "desc": "单体抛物线",
         "icon": "",
@@ -352,7 +352,7 @@
         "result": ""
     },
     {
-        "id": 400002,
+        "id": 40102,
         "name": "",
         "desc": "2散射",
         "icon": "",
@@ -374,7 +374,7 @@
         "result": ""
     },
     {
-        "id": 400003,
+        "id": 40103,
         "name": "",
         "desc": "3散射",
         "icon": "",
@@ -396,7 +396,7 @@
         "result": ""
     },
     {
-        "id": 400004,
+        "id": 40104,
         "name": "",
         "desc": "穿透效果",
         "icon": "",
@@ -418,7 +418,7 @@
         "result": ""
     },
     {
-        "id": 400005,
+        "id": 40105,
         "name": "",
         "desc": "5散射",
         "icon": "",
@@ -440,7 +440,7 @@
         "result": ""
     },
     {
-        "id": 500001,
+        "id": 50101,
         "name": "",
         "desc": "直线戳攻击",
         "icon": "",
@@ -462,7 +462,7 @@
         "result": ""
     },
     {
-        "id": 500002,
+        "id": 50102,
         "name": "",
         "desc": "2段连击",
         "icon": "",
@@ -484,7 +484,7 @@
         "result": ""
     },
     {
-        "id": 500003,
+        "id": 50103,
         "name": "",
         "desc": "三连击",
         "icon": "",
@@ -506,7 +506,7 @@
         "result": ""
     },
     {
-        "id": 500004,
+        "id": 50104,
         "name": "",
         "desc": "三连击加眩晕效果",
         "icon": "",
@@ -528,7 +528,7 @@
         "result": ""
     },
     {
-        "id": 500005,
+        "id": 50105,
         "name": "",
         "desc": "三连击加眩晕效果后添加一段横扫，并击退",
         "icon": "",
diff --git a/assets/bundles/first/config/Text.json b/assets/bundles/first/config/Text.json
index 9b2b566..2db833c 100644
--- a/assets/bundles/first/config/Text.json
+++ b/assets/bundles/first/config/Text.json
@@ -32,7 +32,7 @@
         "id": 1002,
         "type": 1,
         "level": 2,
-        "weight": 0,
+        "weight": 30,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -61,7 +61,7 @@
         "id": 1003,
         "type": 1,
         "level": 3,
-        "weight": 0,
+        "weight": 10,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -90,7 +90,7 @@
         "id": 1004,
         "type": 1,
         "level": 4,
-        "weight": 0,
+        "weight": 4,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -119,7 +119,7 @@
         "id": 1005,
         "type": 2,
         "level": 1,
-        "weight": 0,
+        "weight": 55,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -148,7 +148,7 @@
         "id": 1006,
         "type": 2,
         "level": 2,
-        "weight": 0,
+        "weight": 30,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -177,7 +177,7 @@
         "id": 1007,
         "type": 2,
         "level": 3,
-        "weight": 0,
+        "weight": 10,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -206,7 +206,7 @@
         "id": 1008,
         "type": 2,
         "level": 4,
-        "weight": 0,
+        "weight": 4,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -235,7 +235,7 @@
         "id": 1009,
         "type": 3,
         "level": 1,
-        "weight": 0,
+        "weight": 55,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -264,7 +264,7 @@
         "id": 1010,
         "type": 3,
         "level": 2,
-        "weight": 0,
+        "weight": 30,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -293,7 +293,7 @@
         "id": 1011,
         "type": 3,
         "level": 3,
-        "weight": 0,
+        "weight": 10,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -322,7 +322,7 @@
         "id": 1012,
         "type": 3,
         "level": 4,
-        "weight": 0,
+        "weight": 4,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -351,7 +351,7 @@
         "id": 1013,
         "type": 4,
         "level": 1,
-        "weight": 0,
+        "weight": 55,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -380,7 +380,7 @@
         "id": 1014,
         "type": 4,
         "level": 2,
-        "weight": 0,
+        "weight": 30,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -409,7 +409,7 @@
         "id": 1015,
         "type": 4,
         "level": 3,
-        "weight": 0,
+        "weight": 10,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -438,7 +438,7 @@
         "id": 1016,
         "type": 4,
         "level": 4,
-        "weight": 0,
+        "weight": 4,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -467,7 +467,7 @@
         "id": 1017,
         "type": 5,
         "level": 1,
-        "weight": 0,
+        "weight": 55,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -496,7 +496,7 @@
         "id": 1018,
         "type": 5,
         "level": 2,
-        "weight": 0,
+        "weight": 30,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -525,7 +525,7 @@
         "id": 1019,
         "type": 5,
         "level": 3,
-        "weight": 0,
+        "weight": 10,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -554,7 +554,7 @@
         "id": 1020,
         "type": 5,
         "level": 4,
-        "weight": 0,
+        "weight": 4,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -583,7 +583,7 @@
         "id": 2001,
         "type": 10,
         "level": 0,
-        "weight": 0,
+        "weight": 3,
         "group": "",
         "quality": 0,
         "icon": "",
@@ -612,7 +612,7 @@
         "id": 2002,
         "type": 11,
         "level": 0,
-        "weight": 0,
+        "weight": 2,
         "group": "",
         "quality": 0,
         "icon": "",
diff --git a/assets/bundles/rank/spine/获得新武器光晕效果.json.meta b/assets/bundles/rank/spine/获得新武器光晕效果.json.meta
index 4de28e0..be150a6 100644
--- a/assets/bundles/rank/spine/获得新武器光晕效果.json.meta
+++ b/assets/bundles/rank/spine/获得新武器光晕效果.json.meta
@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "atlasUuid": "afd3a7ab-cc62-4f75-877f-e89b8db42767"
+    "atlasUuid": "3f83e816-c888-4208-b564-e901ecaaae42"
   }
 }
diff --git a/assets/mx/module/merge/core/MergeSession.ts b/assets/mx/module/merge/core/MergeSession.ts
index 2578149..b5e14ce 100644
--- a/assets/mx/module/merge/core/MergeSession.ts
+++ b/assets/mx/module/merge/core/MergeSession.ts
@@ -11,6 +11,7 @@ import {
     cellKindAfterReturnToBag,
     cellKindAfterType3Pickup,
     cellKindAfterType3Place,
+    isElementGlyphType,
 } from '../rules/MapPlaceRules';
 import { UpgradeSystem } from '../upgrade/UpgradeSystem';
 import {
@@ -437,7 +438,7 @@ export class MergeSession {
 
         const w2Type = Number(this._config.getWeapon2Type(slot.weapon2Id)) as Weapon2TileType;
 
-        if (w2Type === Weapon2TileType.Grid) {
+        if (!isElementGlyphType(w2Type) && w2Type === Weapon2TileType.Grid) {
             if (!this._canDropOnCell(gridIndex, w2Type)) {
                 return this._dropRejectReason(gridIndex, w2Type);
             }
@@ -449,7 +450,7 @@ export class MergeSession {
             return null;
         }
 
-        if (w2Type === Weapon2TileType.Shovel) {
+        if (!isElementGlyphType(w2Type) && w2Type === Weapon2TileType.Shovel) {
             if (!this._canDropOnCell(gridIndex, w2Type)) {
                 return this._dropRejectReason(gridIndex, w2Type);
             }
@@ -472,6 +473,11 @@ export class MergeSession {
 
         const targetTile = this.map.getTile(gridIndex);
         if (targetTile) {
+            const element = this._mergeElementOntoMap(slot, gridIndex, targetTile, () => {
+                this.bag.clearSlot(slotIndex);
+            });
+            if (element !== 'skip') return element;
+
             const merged = this._tryBagMapSingleMerge(slotIndex, gridIndex, slot, targetTile);
             if (merged === null) return null;
             if (merged !== 'skip') return merged;
@@ -494,6 +500,7 @@ export class MergeSession {
 
     private _dropMapToMap(fromGrid: number, toGrid: number): PlaceRejectReason | null {
         const pendingType3 = this._pendingDragTile?.source === TileSource.PrepPlaced
+            && !isElementGlyphType(this._config.getWeapon2Type(this._pendingDragTile.weapon2Id))
             && this._config.getWeapon2Type(this._pendingDragTile.weapon2Id) === Weapon2TileType.Grid;
 
         if (fromGrid === toGrid) {
@@ -509,7 +516,7 @@ export class MergeSession {
 
         const w2Type = this._config.getWeapon2Type(tile.weapon2Id) as Weapon2TileType;
 
-        if (w2Type === Weapon2TileType.Grid && tile.source === TileSource.PrepPlaced) {
+        if (!isElementGlyphType(w2Type) && w2Type === Weapon2TileType.Grid && tile.source === TileSource.PrepPlaced) {
             if (!this._canDropOnCell(toGrid, Weapon2TileType.Grid)) {
                 return this._dropRejectReason(toGrid, Weapon2TileType.Grid);
             }
@@ -545,6 +552,12 @@ export class MergeSession {
 
         const targetTile = this.map.getTile(toGrid);
         if (targetTile) {
+            const element = this._mergeElementOntoMap(tile, toGrid, targetTile, () => {
+                this.map.removeTile(fromGrid);
+                this.map.setCellKind(fromGrid, cellKindAfterReturnToBag());
+            });
+            if (element !== 'skip') return element;
+
             const merged = this._tryMapToMapSingleMerge(fromGrid, toGrid, tile, targetTile);
             if (merged === null) return null;
             if (merged !== 'skip') return merged;
@@ -1184,7 +1197,8 @@ export class MergeSession {
     ): PlaceRejectReason | null | 'skip' {
         if (!this._canSwapWeaponTile(bagSlot.weapon2Id, mapTile.weapon2Id)) return 'skip';
 
-        const cellKind = this.map.getCellKind(gridIndex);
+        const cellKind = this._pathChecker?.getLiveCellKind?.(gridIndex)
+            ?? this.map.getCellKind(gridIndex);
         if (cellKind !== MapCellKind.Put) return 'skip';
 
         const mapW2Type = this._config.getWeapon2Type(mapTile.weapon2Id) as Weapon2TileType;
@@ -1207,8 +1221,8 @@ export class MergeSession {
     ): PlaceRejectReason | null | 'skip' {
         if (!this._canSwapWeaponTile(sourceTile.weapon2Id, targetTile.weapon2Id)) return 'skip';
 
-        const fromKind = this.map.getCellKind(fromGrid);
-        const toKind = this.map.getCellKind(toGrid);
+        const fromKind = this._pathChecker?.getLiveCellKind?.(fromGrid) ?? this.map.getCellKind(fromGrid);
+        const toKind = this._pathChecker?.getLiveCellKind?.(toGrid) ?? this.map.getCellKind(toGrid);
         if (fromKind !== MapCellKind.Put || toKind !== MapCellKind.Put) return 'skip';
 
         const srcW2Type = this._config.getWeapon2Type(sourceTile.weapon2Id) as Weapon2TileType;
@@ -1232,7 +1246,8 @@ export class MergeSession {
     ): PlaceRejectReason | null | 'skip' {
         if (!this._canSwapWeaponTile(bagSlot.weapon2Id, mapTile.weapon2Id)) return 'skip';
 
-        const cellKind = this.map.getCellKind(fromGrid);
+        const cellKind = this._pathChecker?.getLiveCellKind?.(fromGrid)
+            ?? this.map.getCellKind(fromGrid);
         if (cellKind !== MapCellKind.Put) return 'skip';
 
         this.map.placeTile(fromGrid, this._mapTileFromBagSlot(bagSlot, TileSource.BagRefresh));
@@ -1243,13 +1258,37 @@ export class MergeSession {
         return null;
     }
 
-    /** 仅 type1/2 攻击字块可参与交换 */
+    /**
+     * 五行同 Text.type、同显示等级：目标格等级 +1。
+     * 不是五行对，或类型/等级不同，返回 skip。
+     */
+    private _mergeElementOntoMap(
+        source: { weapon2Id: number; level?: number },
+        toGrid: number,
+        target: MapTileRecord,
+        clearSource: () => void,
+    ): PlaceRejectReason | null | 'skip' {
+        const srcType = Math.floor(this._config.getWeapon2Type(source.weapon2Id));
+        const dstType = Math.floor(this._config.getWeapon2Type(target.weapon2Id));
+        if (srcType < 1 || srcType > 5 || dstType < 1 || dstType > 5) return 'skip';
+        const srcLevel = Math.floor(source.level ?? 1);
+        const dstLevel = Math.floor(target.level ?? 1);
+        if (srcType !== dstType || srcLevel !== dstLevel) return 'skip';
+        const max = this._config.getElementMaxLevel(srcType);
+        if (srcLevel >= max) return PlaceRejectReason.MaxLevel;
+        const newLevel = srcLevel + 1;
+        clearSource();
+        this.map.placeTile(toGrid, { ...target, level: newLevel });
+        this._recompose();
+        this.emit(MergeEventFactory.mapUpgraded(toGrid, target.weapon1Id ?? 0, newLevel));
+        return null;
+    }
+
+    /** 仅五行字可参与交换 */
     private _canSwapWeaponTile(weapon2IdA: number, weapon2IdB: number): boolean {
-        const typeA = this._config.getWeapon2Type(weapon2IdA) as Weapon2TileType;
-        const typeB = this._config.getWeapon2Type(weapon2IdB) as Weapon2TileType;
-        const swappable = (t: Weapon2TileType) =>
-            t === Weapon2TileType.Single || t === Weapon2TileType.Combo;
-        return swappable(typeA) && swappable(typeB);
+        const typeA = this._config.getWeapon2Type(weapon2IdA);
+        const typeB = this._config.getWeapon2Type(weapon2IdB);
+        return isElementGlyphType(typeA) && isElementGlyphType(typeB);
     }
 
     /** 背包槽 → 地图字块（含损毁与英雄绑定） */
diff --git a/assets/mx/module/merge/index.ts b/assets/mx/module/merge/index.ts
index 88d2d2c..11cfe7a 100644
--- a/assets/mx/module/merge/index.ts
+++ b/assets/mx/module/merge/index.ts
@@ -25,6 +25,7 @@ export { MapTileBoard } from './board/MapTileBoard';
 export type { MapCellSnapshot } from './board/MapTileBoard';
 
 export {
+    isElementGlyphType,
     canDropWeapon2OnCell,
     canDragMapTile,
     canDragPrepType3Cell,
diff --git a/assets/mx/module/merge/rules/MapPlaceRules.ts b/assets/mx/module/merge/rules/MapPlaceRules.ts
index b45637f..75c5a45 100644
--- a/assets/mx/module/merge/rules/MapPlaceRules.ts
+++ b/assets/mx/module/merge/rules/MapPlaceRules.ts
@@ -1,6 +1,15 @@
 import { MapCellKind, PlaceRejectReason, TileSource, Weapon2TileType, type MapTileRecord } from '../types/MergeTypes';
 
-/** 根据 Weapon2.type 判断能否落到该格（type1/2 只认可放置且尚无字块） */
+/**
+ * 新产品五行字：Text.type 1–5（金木水火土），与旧 Single/Combo/Grid/Shovel 枚举值重叠。
+ * @param weapon2Type Text.type
+ */
+export function isElementGlyphType(weapon2Type: number): boolean {
+    const t = Math.floor(Number(weapon2Type));
+    return t >= 1 && t <= 5;
+}
+
+/** 根据 Weapon2.type 判断能否落到该格（五行字只认空 Put） */
 export function canDropWeapon2OnCell(
     weapon2Type: Weapon2TileType,
     cellKind: MapCellKind,
@@ -8,11 +17,9 @@ export function canDropWeapon2OnCell(
     canPutGrid = false,
 ): boolean {
     if (hasTile) return false;
-    // 配表 type 可能是字符串，统一成数字再比
-    switch (Number(weapon2Type)) {
-        case Weapon2TileType.Single:
-        case Weapon2TileType.Combo:
-            return cellKind === MapCellKind.Put;
+    const t = Number(weapon2Type);
+    if (isElementGlyphType(t)) return cellKind === MapCellKind.Put;
+    switch (t) {
         case Weapon2TileType.Grid:
             return cellKind === MapCellKind.Walkable && canPutGrid;
         case Weapon2TileType.Shovel:
@@ -48,10 +55,9 @@ export function canDragMapTile(
     weapon2Type: Weapon2TileType,
     isBuiltinPutWithoutTile: boolean,
 ): boolean {
-    switch (Number(weapon2Type)) {
-        case Weapon2TileType.Single:
-        case Weapon2TileType.Combo:
-            return true;
+    const t = Number(weapon2Type);
+    if (isElementGlyphType(t)) return true;
+    switch (t) {
         case Weapon2TileType.Grid:
             return tile.source === TileSource.PrepPlaced && !isBuiltinPutWithoutTile;
         case Weapon2TileType.Shovel:
diff --git a/assets/res/battleGame/texture/ui/图层 5898.png b/assets/res/battleGame/texture/ui/图层 5898.png
new file mode 100644
index 0000000..6fc8547
Binary files /dev/null and b/assets/res/battleGame/texture/ui/图层 5898.png differ
diff --git a/assets/res/battleGame/texture/ui/图层 5898.png.meta b/assets/res/battleGame/texture/ui/图层 5898.png.meta
new file mode 100644
index 0000000..691ec9f
--- /dev/null
+++ b/assets/res/battleGame/texture/ui/图层 5898.png.meta	
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "0b9461e4-38ea-4e13-b133-f28d07bc5178",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "0b9461e4-38ea-4e13-b133-f28d07bc5178@6c48a",
+      "displayName": "图层 5898",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "0b9461e4-38ea-4e13-b133-f28d07bc5178",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "0b9461e4-38ea-4e13-b133-f28d07bc5178@f9941",
+      "displayName": "图层 5898",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 96,
+        "height": 68,
+        "rawWidth": 96,
+        "rawHeight": 68,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -48,
+            -34,
+            0,
+            48,
+            -34,
+            0,
+            -48,
+            34,
+            0,
+            48,
+            34,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            68,
+            96,
+            68,
+            0,
+            0,
+            96,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -48,
+            -34,
+            0
+          ],
+          "maxPos": [
+            48,
+            34,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "0b9461e4-38ea-4e13-b133-f28d07bc5178@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "0b9461e4-38ea-4e13-b133-f28d07bc5178@6c48a"
+  }
+}
diff --git a/assets/res/battleGame/texture/ui/锁定.png b/assets/res/battleGame/texture/ui/锁定.png
new file mode 100644
index 0000000..eefab3c
Binary files /dev/null and b/assets/res/battleGame/texture/ui/锁定.png differ
diff --git a/assets/res/battleGame/texture/ui/锁定.png.meta b/assets/res/battleGame/texture/ui/锁定.png.meta
new file mode 100644
index 0000000..e3cedb0
--- /dev/null
+++ b/assets/res/battleGame/texture/ui/锁定.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "201e9a69-4d94-4182-b893-c972f15ee76e",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "201e9a69-4d94-4182-b893-c972f15ee76e@6c48a",
+      "displayName": "锁定",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "201e9a69-4d94-4182-b893-c972f15ee76e",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "201e9a69-4d94-4182-b893-c972f15ee76e@f9941",
+      "displayName": "锁定",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 42,
+        "height": 45,
+        "rawWidth": 42,
+        "rawHeight": 45,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -21,
+            -22.5,
+            0,
+            21,
+            -22.5,
+            0,
+            -21,
+            22.5,
+            0,
+            21,
+            22.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            45,
+            42,
+            45,
+            0,
+            0,
+            42,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -21,
+            -22.5,
+            0
+          ],
+          "maxPos": [
+            21,
+            22.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "201e9a69-4d94-4182-b893-c972f15ee76e@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "201e9a69-4d94-4182-b893-c972f15ee76e@6c48a"
+  }
+}
diff --git a/assets/res/spine/likeRole/数字1.meta b/assets/res/battleGameWeapon/spine/武器.meta
similarity index 70%
rename from assets/res/spine/likeRole/数字1.meta
rename to assets/res/battleGameWeapon/spine/武器.meta
index 99ee321..f81f93a 100644
--- a/assets/res/spine/likeRole/数字1.meta
+++ b/assets/res/battleGameWeapon/spine/武器.meta
@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "4115d7a6-71f6-4c70-87a9-799bc3a97eaa",
+  "uuid": "7926ac92-75a9-4878-b2a4-a647272a2dd5",
   "files": [],
   "subMetas": {},
   "userData": {}
diff --git a/assets/res/spine/likeRole/数字128.meta b/assets/res/battleGameWeapon/spine/武器/大宝剑.meta
similarity index 70%
rename from assets/res/spine/likeRole/数字128.meta
rename to assets/res/battleGameWeapon/spine/武器/大宝剑.meta
index 66e5649..1f328b7 100644
--- a/assets/res/spine/likeRole/数字128.meta
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑.meta
@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "e12d7cb8-5cca-414f-8cb1-dedf71a4b23c",
+  "uuid": "28969b5f-98cd-4781-ac67-38f3c5c75b3e",
   "files": [],
   "subMetas": {},
   "userData": {}
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/.WeDrive b/assets/res/battleGameWeapon/spine/武器/大宝剑/.WeDrive
new file mode 100644
index 0000000..fe216e7
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/.WeDrive
@@ -0,0 +1 @@
+D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\大宝剑
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas
new file mode 100644
index 0000000..cb9e67d
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas
@@ -0,0 +1,55 @@
+
+剑类武器+专属技能.png
+size: 1363,456
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+刀光1
+  rotate: false
+  xy: 0, 0
+  size: 479, 456
+  orig: 481, 456
+  offset: 1, 0
+  index: -1
+刀光2
+  rotate: false
+  xy: 481, 9
+  size: 370, 447
+  orig: 481, 456
+  offset: 9, 0
+  index: -1
+刀光3
+  rotate: false
+  xy: 853, 70
+  size: 198, 386
+  orig: 481, 456
+  offset: 15, 0
+  index: -1
+刀光4
+  rotate: false
+  xy: 1224, 93
+  size: 139, 363
+  orig: 481, 456
+  offset: 32, 0
+  index: -1
+大宝剑
+  rotate: false
+  xy: 1053, 106
+  size: 169, 350
+  orig: 171, 352
+  offset: 1, 1
+  index: -1
+特效
+  rotate: true
+  xy: 1053, 18
+  size: 86, 135
+  orig: 86, 140
+  offset: 0, 0
+  index: -1
+飞剑
+  rotate: true
+  xy: 853, 21
+  size: 47, 86
+  orig: 49, 88
+  offset: 1, 1
+  index: -1
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas.meta b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas.meta
new file mode 100644
index 0000000..1b12314
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas.meta
@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "5ba2c37c-132e-4f19-8c2c-c5ebd2d1ca6d",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json
new file mode 100644
index 0000000..c0648d6
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"aoOOPx6V4XTvBaqRb8EMXpc3GNw","spine":"3.8.75","x":-18.16,"y":-30.63,"width":38.48,"height":79.2,"images":"./images/剑类/","audio":""},"bones":[{"name":"root","scaleX":0.225,"scaleY":0.225},{"name":"大宝剑","parent":"root","length":135.12,"rotation":90,"x":1.9,"y":-51.66},{"name":"刀光1","parent":"root","length":141.08,"rotation":-176.8,"x":-237.82,"y":18.53},{"name":"特效","parent":"root","length":80.47,"rotation":-91.08,"x":11.39,"y":212,"scaleX":2.7511,"scaleY":1.9129},{"name":"特效2","parent":"root","length":80.47,"rotation":-91.08,"x":11.39,"y":212,"scaleX":2.7511,"scaleY":-1.9129},{"name":"特效3","parent":"root","length":80.47,"rotation":-91.08,"x":11.39,"y":212,"scaleX":2.7511,"scaleY":1.9129}],"slots":[{"name":"特效","bone":"特效"},{"name":"特效3","bone":"特效3"},{"name":"特效2","bone":"特效2"},{"name":"刀光1","bone":"刀光1"},{"name":"大宝剑","bone":"大宝剑","attachment":"大宝剑"}],"skins":[{"name":"default","attachments":{"刀光1":{"刀光1":{"x":25.33,"y":-34.56,"rotation":143.58,"width":481,"height":456},"刀光2":{"x":25.33,"y":-34.56,"rotation":143.58,"width":481,"height":456},"刀光3":{"x":25.33,"y":-34.56,"rotation":143.58,"width":481,"height":456},"刀光4":{"x":25.33,"y":-34.56,"rotation":143.58,"width":481,"height":456}},"特效2":{"特效":{"x":56.33,"y":8.82,"rotation":-90.81,"width":86,"height":140}},"特效3":{"特效":{"x":56.33,"y":8.82,"rotation":-90.81,"width":86,"height":140}},"特效":{"特效":{"x":56.33,"y":8.82,"rotation":-90.81,"width":86,"height":140}},"大宝剑":{"大宝剑":{"x":91.53,"y":-2.87,"rotation":-90,"width":171,"height":352},"飞剑":{"x":91.53,"y":2.44,"scaleX":2.571,"scaleY":2.571,"rotation":-115.69,"width":49,"height":88}}}}],"animations":{"待机":{"bones":{"大宝剑":{"scale":[{},{"time":0.4333,"x":0.919,"y":1.059},{"time":1}]}}},"攻击1":{"slots":{"刀光1":{"attachment":[{"time":0.3667,"name":"刀光1"},{"time":0.4667,"name":"刀光2"},{"time":0.5333,"name":"刀光3"},{"time":0.6,"name":"刀光4"},{"time":0.6667,"name":null}]}},"bones":{"大宝剑":{"rotate":[{},{"time":0.3,"angle":-38.52},{"time":0.3333,"angle":83.32},{"time":0.4,"angle":129.33},{"time":0.5333,"angle":136.86,"curve":"stepped"},{"time":0.6333,"angle":136.86},{"time":1}],"translate":[{},{"time":0.3,"x":45.94,"y":68.9},{"time":0.3333,"x":-91.47,"y":30.2},{"time":0.4,"x":-106.05,"y":-53.19},{"time":0.5333,"x":-90.29,"y":-71.91,"curve":"stepped"},{"time":0.6333,"x":-90.29,"y":-71.91},{"time":1,"x":1.09,"y":15.2},{"time":1.5}],"scale":[{},{"time":0.3667,"x":1.282,"y":1.282,"curve":"stepped"},{"time":0.8333,"x":1.282,"y":1.282},{"time":1.5}]},"刀光1":{"rotate":[{"time":0.3667,"angle":-0.18},{"time":0.4333,"angle":42.57},{"time":0.5333,"angle":50.9}],"translate":[{"time":0.3667,"x":89.23,"y":90.89},{"time":0.4333,"x":60.75,"y":-47.14}],"scale":[{"time":0.3667,"x":1.506,"y":1.506}],"shear":[{"time":0.3667,"x":17.66,"y":7.66},{"time":0.4333}]}}},"攻击2":{"slots":{"刀光1":{"attachment":[{"time":0.3667,"name":"刀光1"},{"time":0.4667,"name":"刀光2"},{"time":0.5333,"name":"刀光3"},{"time":0.6,"name":"刀光4"},{"time":0.6667,"name":null},{"time":0.7,"name":"刀光1"},{"time":0.8,"name":"刀光2"},{"time":0.8667,"name":"刀光3"},{"time":0.9333,"name":"刀光4"},{"time":1,"name":null}]}},"bones":{"大宝剑":{"rotate":[{},{"time":0.3,"angle":-38.52},{"time":0.3333,"angle":83.32},{"time":0.4,"angle":129.33},{"time":0.5333,"angle":136.86},{"time":0.6667,"angle":149.54},{"time":0.7,"angle":34.21},{"time":0.7667,"angle":-28.01},{"time":0.9,"angle":-44.77},{"time":1,"angle":-46.84},{"time":1.1667}],"translate":[{},{"time":0.3,"x":45.94,"y":68.9},{"time":0.3333,"x":-91.47,"y":30.2},{"time":0.4,"x":-106.05,"y":-53.19},{"time":0.5333,"x":-90.29,"y":-71.91},{"time":0.6667,"x":-73.78,"y":-92.73},{"time":0.7,"x":-13.92,"y":-11.91},{"time":0.7667,"x":95.23,"y":172.71},{"time":0.9,"x":122.9,"y":191.84},{"time":1,"x":137.18,"y":187.76},{"time":1.1667,"x":1.09,"y":15.2},{"time":1.5}],"scale":[{},{"time":0.3667,"x":1.282,"y":1.282,"curve":"stepped"},{"time":0.8333,"x":1.282,"y":1.282},{"time":1.5}]},"刀光1":{"rotate":[{"time":0.3667,"angle":-0.18},{"time":0.4333,"angle":42.57},{"time":0.5333,"angle":50.9,"curve":"stepped"},{"time":0.7,"angle":101.58},{"time":0.7667,"angle":43.96},{"time":0.9,"angle":36.94}],"translate":[{"time":0.3667,"x":89.23,"y":90.89},{"time":0.4333,"x":60.75,"y":-47.14,"curve":"stepped"},{"time":0.7,"x":15.97,"y":-123.3},{"time":0.7667,"x":159.26,"y":117.41},{"time":0.9,"x":194.9,"y":141.27}],"scale":[{"time":0.3667,"x":1.506,"y":1.506,"curve":"stepped"},{"time":0.4333,"x":1.506,"y":1.506,"curve":"stepped"},{"time":0.7,"x":-1.398,"y":1.398},{"time":0.7667,"x":-1.731,"y":1.731}],"shear":[{"time":0.3667,"x":17.66,"y":7.66},{"time":0.4333,"curve":"stepped"},{"time":0.7,"x":-7.59,"y":-4.74},{"time":0.7667,"x":5.94,"y":12.5},{"time":0.9,"y":0.06}]}}},"攻击3":{"slots":{"刀光1":{"attachment":[{"time":0.3667,"name":"刀光1"},{"time":0.4667,"name":"刀光2"},{"time":0.5333,"name":"刀光3"},{"time":0.6,"name":"刀光4"},{"time":0.6667,"name":null},{"time":0.7,"name":"刀光1"},{"time":0.8,"name":"刀光2"},{"time":0.8667,"name":"刀光3"},{"time":0.9333,"name":"刀光4"},{"time":1,"name":null}]}},"bones":{"大宝剑":{"rotate":[{},{"time":0.3,"angle":-38.52},{"time":0.3333,"angle":83.32},{"time":0.4,"angle":129.33},{"time":0.5333,"angle":136.86},{"time":0.6667,"angle":149.54},{"time":0.7,"angle":34.21},{"time":0.7667,"angle":-28.01},{"time":0.9,"angle":-44.77},{"time":1,"angle":-46.84},{"time":1.1667}],"translate":[{},{"time":0.3,"x":45.94,"y":68.9},{"time":0.3333,"x":-91.47,"y":30.2},{"time":0.4,"x":-106.05,"y":-53.19},{"time":0.5333,"x":-90.29,"y":-71.91},{"time":0.6667,"x":-73.78,"y":-92.73},{"time":0.7,"x":-13.92,"y":-11.91},{"time":0.7667,"x":95.23,"y":172.71},{"time":0.9,"x":122.9,"y":191.84},{"time":1,"x":137.18,"y":187.76},{"time":1.1667,"x":1.09,"y":15.2},{"time":1.5}],"scale":[{},{"time":0.3667,"x":1.282,"y":1.282,"curve":"stepped"},{"time":0.8333,"x":1.282,"y":1.282},{"time":1.5}]},"刀光1":{"rotate":[{"time":0.3667,"angle":-0.18},{"time":0.4333,"angle":42.57},{"time":0.5333,"angle":50.9,"curve":"stepped"},{"time":0.7,"angle":101.58},{"time":0.7667,"angle":43.96},{"time":0.9,"angle":36.94}],"translate":[{"time":0.3667,"x":89.23,"y":90.89},{"time":0.4333,"x":60.75,"y":-47.14,"curve":"stepped"},{"time":0.7,"x":15.97,"y":-123.3},{"time":0.7667,"x":159.26,"y":117.41},{"time":0.9,"x":194.9,"y":141.27}],"scale":[{"time":0.3667,"x":1.506,"y":1.506,"curve":"stepped"},{"time":0.4333,"x":1.506,"y":1.506,"curve":"stepped"},{"time":0.7,"x":-1.398,"y":1.398},{"time":0.7667,"x":-1.731,"y":1.731}],"shear":[{"time":0.3667,"x":17.66,"y":7.66},{"time":0.4333,"curve":"stepped"},{"time":0.7,"x":-7.59,"y":-4.74},{"time":0.7667,"x":5.94,"y":12.5},{"time":0.9,"y":0.06}]}}},"攻击4":{"slots":{"刀光1":{"attachment":[{"time":0.3,"name":"刀光1"},{"time":0.3667,"name":"刀光2"},{"time":0.4333,"name":"刀光3"},{"time":0.5,"name":"刀光4"},{"time":0.5333,"name":null},{"time":0.5667,"name":"刀光1"},{"time":0.6667,"name":"刀光2"},{"time":0.7,"name":"刀光3"},{"time":0.7667,"name":"刀光4"},{"time":0.8333,"name":null},{"time":0.9667,"name":"刀光1"},{"time":1.0333,"name":"刀光2"},{"time":1.1,"name":"刀光3"},{"time":1.1333,"name":"刀光4"},{"time":1.1667,"name":null}]}},"bones":{"大宝剑":{"rotate":[{},{"time":0.2333,"angle":-38.52},{"time":0.2667,"angle":83.32},{"time":0.3333,"angle":129.33},{"time":0.4333,"angle":136.86},{"time":0.5333,"angle":149.54},{"time":0.5667,"angle":34.21},{"time":0.6333,"angle":-28.01},{"time":0.7333,"angle":-44.77},{"time":0.8,"angle":-46.63},{"time":0.8333,"angle":-50.3},{"time":0.9,"angle":-53.42},{"time":0.9667,"angle":83.32},{"time":1,"angle":129.33},{"time":1.1333,"angle":141.83},{"time":1.3}],"translate":[{},{"time":0.2333,"x":45.94,"y":68.9},{"time":0.2667,"x":-91.47,"y":30.2},{"time":0.3333,"x":-106.05,"y":-53.19},{"time":0.4333,"x":-90.29,"y":-71.91},{"time":0.5333,"x":-73.78,"y":-92.73},{"time":0.5667,"x":-13.92,"y":-11.91},{"time":0.6333,"x":95.23,"y":172.71},{"time":0.7333,"x":122.9,"y":191.84,"curve":"stepped"},{"time":0.9,"x":122.9,"y":191.84},{"time":0.9667,"x":-91.47,"y":30.2},{"time":1,"x":-106.05,"y":-53.19},{"time":1.1333,"x":-90.29,"y":-71.91},{"time":1.3,"x":1.09,"y":15.2},{"time":1.5}],"scale":[{},{"time":0.3,"x":1.282,"y":1.282,"curve":"stepped"},{"time":1.1667,"x":1.282,"y":1.282},{"time":1.5}]},"刀光1":{"rotate":[{"time":0.3,"angle":-0.18},{"time":0.3667,"angle":42.57},{"time":0.4333,"angle":50.9,"curve":"stepped"},{"time":0.5667,"angle":101.58},{"time":0.6333,"angle":43.96},{"time":0.7333,"angle":36.94,"curve":"stepped"},{"time":0.9667,"angle":-8.94},{"time":1,"angle":42.57},{"time":1.1,"angle":50.9}],"translate":[{"time":0.3,"x":89.23,"y":90.89},{"time":0.3667,"x":60.75,"y":-47.14,"curve":"stepped"},{"time":0.5667,"x":15.97,"y":-123.3},{"time":0.6333,"x":159.26,"y":117.41},{"time":0.7333,"x":194.9,"y":141.27,"curve":"stepped"},{"time":0.9667,"x":144.31,"y":176.57},{"time":1,"x":50.55,"y":-2.26}],"scale":[{"time":0.3,"x":1.506,"y":1.506,"curve":"stepped"},{"time":0.3667,"x":1.506,"y":1.506,"curve":"stepped"},{"time":0.5667,"x":-1.398,"y":1.398},{"time":0.6333,"x":-1.731,"y":1.731,"curve":"stepped"},{"time":0.9667,"x":1.506,"y":1.506},{"time":1,"x":1.597,"y":1.597}],"shear":[{"time":0.3,"x":17.66,"y":7.66},{"time":0.3667,"curve":"stepped"},{"time":0.5667,"x":-7.59,"y":-4.74},{"time":0.6333,"x":5.94,"y":12.5},{"time":0.7333,"y":0.06,"curve":"stepped"},{"time":0.9667,"x":12.67,"y":-1.44},{"time":1}]}}},"飞剑":{"slots":{"大宝剑":{"attachment":[{"name":"飞剑"}]},"特效2":{"color":[{"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff"}],"attachment":[{"name":"特效"}]},"特效":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff"},{"time":0.5,"color":"ffffff00"}],"attachment":[{"name":"特效"}]},"特效3":{"attachment":[{"name":"特效"}]}},"bones":{"特效":{"translate":[{"x":-8.27,"y":-45.47}],"scale":[{"x":0.818,"y":1.117},{"time":0.4667,"x":1.232,"y":1.117,"curve":"stepped"},{"time":0.5,"x":0.818,"y":1.117}]},"特效2":{"translate":[{"x":-14.05,"y":-45.47}],"scale":[{"x":0.943,"y":1.117},{"time":0.2333,"x":1.238,"y":1.117,"curve":"stepped"},{"time":0.2667,"x":0.818,"y":1.117},{"time":0.5,"x":0.943,"y":1.117}]},"特效3":{"translate":[{"x":-8.27,"y":-41.11}],"scale":[{"x":0.606,"y":0.905}]}}}}}
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json.meta b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json.meta
new file mode 100644
index 0000000..7cde757
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "dcce3833-3da9-44f4-ba04-72175d2ae9db",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "5ba2c37c-132e-4f19-8c2c-c5ebd2d1ca6d"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png
new file mode 100644
index 0000000..9f01d7d
Binary files /dev/null and b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png differ
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png.meta b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png.meta
new file mode 100644
index 0000000..aa00f14
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "57dd01b8-21ad-4333-8778-cf8e96f3c340",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "57dd01b8-21ad-4333-8778-cf8e96f3c340@6c48a",
+      "displayName": "剑类武器+专属技能",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "57dd01b8-21ad-4333-8778-cf8e96f3c340",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "57dd01b8-21ad-4333-8778-cf8e96f3c340@f9941",
+      "displayName": "剑类武器+专属技能",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1363,
+        "height": 456,
+        "rawWidth": 1363,
+        "rawHeight": 456,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -681.5,
+            -228,
+            0,
+            681.5,
+            -228,
+            0,
+            -681.5,
+            228,
+            0,
+            681.5,
+            228,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            456,
+            1363,
+            456,
+            0,
+            0,
+            1363,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -681.5,
+            -228,
+            0
+          ],
+          "maxPos": [
+            681.5,
+            228,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "57dd01b8-21ad-4333-8778-cf8e96f3c340@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "57dd01b8-21ad-4333-8778-cf8e96f3c340@6c48a"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas
new file mode 100644
index 0000000..373c37e
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas
@@ -0,0 +1,41 @@
+
+剑阵.png
+size: 1799,492
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+诛仙剑/光圈
+  rotate: false
+  xy: 597, 0
+  size: 547, 492
+  orig: 555, 500
+  offset: 4, 4
+  index: -1
+诛仙剑/光芒1
+  rotate: true
+  xy: 0, 6
+  size: 486, 595
+  orig: 488, 672
+  offset: 1, 1
+  index: -1
+诛仙剑/光芒2
+  rotate: false
+  xy: 1146, 99
+  size: 486, 393
+  orig: 488, 632
+  offset: 1, 1
+  index: -1
+诛仙剑/剑111
+  rotate: true
+  xy: 1146, 21
+  size: 76, 450
+  orig: 82, 505
+  offset: 3, 5
+  index: -1
+诛仙剑/剑222
+  rotate: false
+  xy: 1634, 273
+  size: 165, 219
+  orig: 190, 233
+  offset: 15, 8
+  index: -1
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas.meta b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas.meta
new file mode 100644
index 0000000..67c604e
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas.meta
@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "c6a4d454-8720-43f1-8e79-e06d6a87767d",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json
new file mode 100644
index 0000000..bd30f06
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"zhzIH9twq3bJUTlZVsE2W/41oEk","spine":"3.8.75"},"bones":[{"name":"root"},{"name":"诛仙剑/光圈","parent":"root","length":74.06,"rotation":-1.1,"x":0.86,"y":1.45,"scaleX":0.5,"scaleY":0.5},{"name":"剑","parent":"root","length":84.75,"rotation":-1.44,"x":-103.81,"y":154.84,"scaleX":0.5,"scaleY":0.5},{"name":"剑2","parent":"root","length":84.75,"rotation":-1.44,"x":-50.62,"y":209.57,"scaleX":0.5,"scaleY":0.5},{"name":"剑3","parent":"root","length":84.75,"rotation":-1.44,"x":-6.26,"y":165.55,"scaleX":0.5,"scaleY":0.5},{"name":"剑4","parent":"root","length":84.75,"rotation":-1.44,"x":77.02,"y":191.26,"scaleX":0.5,"scaleY":0.5},{"name":"剑5","parent":"root","length":84.75,"rotation":-1.44,"x":75.25,"y":70.6,"scaleX":0.5,"scaleY":0.5},{"name":"剑6","parent":"root","length":84.75,"rotation":-1.44,"x":113.81,"y":105.7,"scaleX":0.5,"scaleY":0.5},{"name":"剑7","parent":"root","length":84.75,"rotation":-1.44,"x":-0.17,"y":87.39,"scaleX":0.5,"scaleY":0.5},{"name":"剑8","parent":"root","length":84.75,"rotation":-1.44,"x":-49.08,"y":54.29,"scaleX":0.5,"scaleY":0.5},{"name":"剑9","parent":"root","length":84.75,"rotation":-1.44,"x":-39.8,"y":136.01,"scaleX":0.5,"scaleY":0.5},{"name":"剑10","parent":"root","length":84.75,"rotation":-1.44,"x":-75.2,"y":105.55,"scaleX":0.5,"scaleY":0.5},{"name":"剑11","parent":"root","length":84.75,"rotation":-1.44,"x":33.34,"y":106.09,"scaleX":0.5,"scaleY":0.5},{"name":"剑12","parent":"root","length":84.75,"rotation":-1.44,"x":52.82,"y":158.19,"scaleX":0.5,"scaleY":0.5},{"name":"剑13","parent":"root","length":84.75,"rotation":-1.44,"x":-94.27,"y":51.15,"scaleX":0.5,"scaleY":0.5},{"name":"剑14","parent":"root","length":84.75,"rotation":-1.44,"x":20.78,"y":18.39,"scaleX":0.5,"scaleY":0.5},{"name":"剑15","parent":"root","length":84.75,"rotation":-1.44,"x":13.58,"y":206.81,"scaleX":0.5,"scaleY":0.5},{"name":"剑16","parent":"root","length":84.75,"rotation":-1.44,"x":-115.04,"y":106.16,"scaleX":0.5,"scaleY":0.5}],"slots":[{"name":"剑","bone":"剑"},{"name":"剑2","bone":"剑2"},{"name":"剑3","bone":"剑3"},{"name":"剑4","bone":"剑4"},{"name":"剑5","bone":"剑5"},{"name":"剑6","bone":"剑6"},{"name":"剑7","bone":"剑7"},{"name":"剑8","bone":"剑8"},{"name":"剑9","bone":"剑9"},{"name":"剑10","bone":"剑10"},{"name":"剑11","bone":"剑11"},{"name":"剑12","bone":"剑12"},{"name":"剑13","bone":"剑13"},{"name":"剑14","bone":"剑14"},{"name":"剑15","bone":"剑15"},{"name":"剑16","bone":"剑16"},{"name":"诛仙剑/光圈2","bone":"诛仙剑/光圈"},{"name":"诛仙剑/光芒2","bone":"诛仙剑/光圈"},{"name":"诛仙剑/光芒1","bone":"诛仙剑/光圈"}],"skins":[{"name":"default","attachments":{"剑2":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑3":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑4":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑5":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑6":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑7":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑8":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑9":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"诛仙剑/光芒1":{"诛仙剑/光芒1":{"x":-5.22,"y":123.09,"rotation":1.1,"width":488,"height":672}},"诛仙剑/光芒2":{"诛仙剑/光芒2":{"x":-4.84,"y":103.1,"rotation":1.1,"width":488,"height":632}},"剑":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"诛仙剑/光圈2":{"诛仙剑/光圈":{"x":-2.4,"y":2.13,"rotation":1.1,"width":555,"height":500}},"剑10":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑11":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑12":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑13":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑14":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑15":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}},"剑16":{"诛仙剑/剑111":{"x":-4.74,"y":217.38,"rotation":1.44,"width":82,"height":505},"诛仙剑/剑222":{"x":1.03,"y":-11.55,"rotation":1.44,"width":190,"height":233}}}}],"animations":{"剑阵":{"slots":{"诛仙剑/光芒1":{"color":[{"color":"ffffffff"},{"time":0.3333,"color":"ffffff5d"},{"time":0.7333,"color":"ffffffff"},{"time":1.1667,"color":"ffffff5d"},{"time":1.5667,"color":"ffffffff"},{"time":2,"color":"ffffff5d"},{"time":2.3,"color":"ffffffff"}],"attachment":[{"name":"诛仙剑/光芒1"}]},"剑8":{"color":[{"time":1.2333,"color":"ffffffff"},{"time":1.4667,"color":"ffffff00"}],"attachment":[{"time":0.8,"name":"诛仙剑/剑111"},{"time":0.9667,"name":"诛仙剑/剑222"}]},"剑16":{"color":[{"time":1.3667,"color":"ffffffff"},{"time":1.6,"color":"ffffff00"}],"attachment":[{"time":0.9333,"name":"诛仙剑/剑111"},{"time":1.1,"name":"诛仙剑/剑222"}]},"剑4":{"color":[{"time":1.1667,"color":"ffffffff"},{"time":1.4,"color":"ffffff00"}],"attachment":[{"time":0.7333,"name":"诛仙剑/剑111"},{"time":0.9,"name":"诛仙剑/剑222"}]},"诛仙剑/光芒2":{"color":[{"color":"ffffffff"},{"time":0.3333,"color":"ffffff5d"},{"time":0.7333,"color":"ffffffff"},{"time":1.1667,"color":"ffffff5d"},{"time":1.5667,"color":"ffffffff"},{"time":2,"color":"ffffff5d"},{"time":2.3,"color":"ffffffff"}],"attachment":[{"name":"诛仙剑/光芒2"},{"time":2.3,"name":null}]},"剑15":{"color":[{"time":0.7,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00","curve":"stepped"},{"time":1.6667,"color":"ffffffff"}],"attachment":[{"time":0.2667,"name":"诛仙剑/剑111"},{"time":0.4333,"name":"诛仙剑/剑222"},{"time":1.6667,"name":"诛仙剑/剑111"},{"time":1.8333,"name":"诛仙剑/剑222"}]},"剑5":{"color":[{"time":0.3,"color":"ffffffff"},{"time":0.5667,"color":"ffffff00","curve":"stepped"},{"time":1.2333,"color":"ffffffff","curve":"stepped"},{"time":1.6667,"color":"ffffffff"},{"time":1.9,"color":"ffffff00","curve":"stepped"},{"time":2.1667,"color":"ffffffff"}],"attachment":[{"name":"诛仙剑/剑222"},{"time":0.5667,"name":"诛仙剑/剑111"},{"time":1.2,"name":"诛仙剑/剑222"},{"time":1.9667,"name":"诛仙剑/剑111"},{"time":2.1333,"name":"诛仙剑/剑222"}]},"剑3":{"color":[{"time":0.9,"color":"ffffffff"},{"time":1.1333,"color":"ffffff00"}],"attachment":[{"time":0.4667,"name":"诛仙剑/剑111"},{"time":0.6333,"name":"诛仙剑/剑222"}]},"剑13":{"color":[{"time":0.7333,"color":"ffffffff"},{"time":0.9667,"color":"ffffff00"}],"attachment":[{"time":0.3,"name":"诛仙剑/剑111"},{"time":0.4667,"name":"诛仙剑/剑222"}]},"剑10":{"color":[{"time":0.0667,"color":"ffffffff"},{"time":0.3333,"color":"ffffff00","curve":"stepped"},{"time":1.9333,"color":"ffffffff"}],"attachment":[{"name":"诛仙剑/剑222"},{"time":0.3333,"name":"诛仙剑/剑111"},{"time":2.1,"name":"诛仙剑/剑222"}]},"剑9":{"color":[{"time":1.8333,"color":"ffffffff"},{"time":2.0667,"color":"ffffff00"}],"attachment":[{"time":1.4,"name":"诛仙剑/剑111"},{"time":1.5667,"name":"诛仙剑/剑222"}]},"诛仙剑/光圈2":{"color":[{"color":"ffffff8a"}],"attachment":[{"name":"诛仙剑/光圈"}]},"剑6":{"color":[{"time":1.9,"color":"ffffffff"},{"time":2.1333,"color":"ffffff00"}],"attachment":[{"time":1.4667,"name":"诛仙剑/剑111"},{"time":1.6333,"name":"诛仙剑/剑222"}]},"剑2":{"color":[{"time":0.4333,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}],"attachment":[{"name":"诛仙剑/剑111"},{"time":0.1667,"name":"诛仙剑/剑222"}]},"剑":{"color":[{"time":0.7667,"color":"ffffffff"},{"time":1,"color":"ffffff00","curve":"stepped"},{"time":1.5667,"color":"ffffffff","curve":"stepped"},{"time":2.0667,"color":"ffffffff"},{"time":2.3,"color":"ffffff00"}],"attachment":[{"time":0.3333,"name":"诛仙剑/剑111"},{"time":0.5,"name":"诛仙剑/剑222"},{"time":1.5667,"name":"诛仙剑/剑111"},{"time":1.7333,"name":"诛仙剑/剑222"}]},"剑11":{"color":[{"time":1,"color":"ffffffff"},{"time":1.2333,"color":"ffffff00","curve":"stepped"},{"time":1.5667,"color":"ffffffff","curve":"stepped"},{"time":2,"color":"ffffffff"},{"time":2.2333,"color":"ffffff00"}],"attachment":[{"time":0.5667,"name":"诛仙剑/剑111"},{"time":0.7333,"name":"诛仙剑/剑222"},{"time":1.5667,"name":"诛仙剑/剑111"},{"time":1.7333,"name":"诛仙剑/剑222"}]},"剑14":{"color":[{"time":0.4333,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00","curve":"stepped"},{"time":1.1,"color":"ffffffff","curve":"stepped"},{"time":1.5333,"color":"ffffffff"},{"time":1.7667,"color":"ffffff00"}],"attachment":[{"name":"诛仙剑/剑111"},{"time":0.1667,"name":"诛仙剑/剑222"},{"time":1.1,"name":"诛仙剑/剑111"},{"time":1.2667,"name":"诛仙剑/剑222"}]},"剑7":{"color":[{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00","curve":"stepped"},{"time":1.1667,"color":"ffffffff","curve":"stepped"},{"time":1.6,"color":"ffffffff"},{"time":1.8333,"color":"ffffff00"}],"attachment":[{"time":0.1333,"name":"诛仙剑/剑111"},{"time":0.3,"name":"诛仙剑/剑222"},{"time":1.1667,"name":"诛仙剑/剑111"},{"time":1.3333,"name":"诛仙剑/剑222"}]},"剑12":{"color":[{"time":1.4333,"color":"ffffffff"},{"time":1.6667,"color":"ffffff00"}],"attachment":[{"time":1,"name":"诛仙剑/剑111"},{"time":1.1667,"name":"诛仙剑/剑222"}]}},"bones":{"诛仙剑/光圈":{"scale":[{},{"time":0.1,"x":0.986,"y":0.986},{"time":0.2},{"time":0.3,"x":0.986,"y":0.986},{"time":0.4,"curve":"stepped"},{"time":0.7},{"time":0.8,"x":0.986,"y":0.986},{"time":0.9},{"time":1,"x":0.986,"y":0.986},{"time":1.1},{"time":1.2,"x":0.986,"y":0.986},{"time":1.3,"curve":"stepped"},{"time":1.7},{"time":1.8,"x":0.986,"y":0.986},{"time":1.9},{"time":2,"x":0.986,"y":0.986},{"time":2.1},{"time":2.2,"x":0.986,"y":0.986},{"time":2.3}]},"剑":{"translate":[{"time":0.3333,"x":4.98,"y":93.98},{"time":0.5,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.5667,"x":4.98,"y":93.98},{"time":1.7333,"x":4.98,"y":-91.14}]},"剑2":{"translate":[{"x":4.98,"y":93.98},{"time":0.1667,"x":4.98,"y":-91.14}]},"剑3":{"translate":[{"time":0.4667,"x":4.98,"y":93.98},{"time":0.6333,"x":4.98,"y":-91.14}]},"剑4":{"translate":[{"time":0.7333,"x":4.98,"y":93.98},{"time":0.9,"x":4.98,"y":-91.14}]},"剑5":{"translate":[{"x":4.98,"y":-54.11},{"time":0.0333,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":0.2,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":0.5667,"x":4.98,"y":93.98,"curve":"stepped"},{"time":1.2333,"x":4.98,"y":93.98},{"time":1.4,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.9,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":2.1667,"x":4.98,"y":93.98},{"time":2.3,"x":4.98,"y":-54.11}]},"剑6":{"translate":[{"time":1.4667,"x":4.98,"y":93.98},{"time":1.6333,"x":4.98,"y":-91.14}]},"剑7":{"translate":[{"time":0.1333,"x":4.98,"y":93.98},{"time":0.3,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":0.8,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.1667,"x":4.98,"y":93.98},{"time":1.3333,"x":4.98,"y":-91.14}]},"剑8":{"translate":[{"time":0.8,"x":4.98,"y":93.98},{"time":0.9667,"x":4.98,"y":-91.14}]},"剑9":{"translate":[{"time":1.4,"x":4.98,"y":93.98},{"time":1.5667,"x":4.98,"y":-91.14}]},"剑10":{"translate":[{"x":4.98,"y":-91.14,"curve":"stepped"},{"time":0.3333,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.9333,"x":4.98,"y":93.98},{"time":2.1,"x":4.98,"y":-91.14}]},"剑11":{"translate":[{"time":0.5667,"x":4.98,"y":93.98},{"time":0.7333,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.2333,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.5667,"x":4.98,"y":93.98},{"time":1.7333,"x":4.98,"y":-91.14}]},"剑12":{"translate":[{"time":1,"x":4.98,"y":93.98},{"time":1.1667,"x":4.98,"y":-91.14}]},"剑13":{"translate":[{"time":0.3,"x":4.98,"y":93.98},{"time":0.4667,"x":4.98,"y":-91.14}]},"剑14":{"translate":[{"x":4.98,"y":93.98},{"time":0.1667,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":0.6667,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.1,"x":4.98,"y":93.98},{"time":1.2667,"x":4.98,"y":-91.14}]},"剑15":{"translate":[{"time":0.2667,"x":4.98,"y":93.98},{"time":0.4333,"x":4.98,"y":-91.14,"curve":"stepped"},{"time":1.6667,"x":4.98,"y":93.98},{"time":1.8333,"x":4.98,"y":-91.14}]},"剑16":{"translate":[{"time":0.9333,"x":4.98,"y":93.98},{"time":1.1,"x":4.98,"y":-91.14}]}}}}}
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json.meta b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json.meta
new file mode 100644
index 0000000..af7b993
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "7b03a26d-8a9f-4312-a397-d414e1ef4574",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "c6a4d454-8720-43f1-8e79-e06d6a87767d"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png
new file mode 100644
index 0000000..eba5ff9
Binary files /dev/null and b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png differ
diff --git a/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png.meta b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png.meta
new file mode 100644
index 0000000..c469e5e
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "0378f015-dad8-4b18-9d1c-12a0fa698bbf",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@6c48a",
+      "displayName": "剑阵",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "0378f015-dad8-4b18-9d1c-12a0fa698bbf",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@f9941",
+      "displayName": "剑阵",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1799,
+        "height": 492,
+        "rawWidth": 1799,
+        "rawHeight": 492,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -899.5,
+            -246,
+            0,
+            899.5,
+            -246,
+            0,
+            -899.5,
+            246,
+            0,
+            899.5,
+            246,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            492,
+            1799,
+            492,
+            0,
+            0,
+            1799,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -899.5,
+            -246,
+            0
+          ],
+          "maxPos": [
+            899.5,
+            246,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@6c48a"
+  }
+}
diff --git a/assets/res/spine/likeRole/数字16.meta b/assets/res/battleGameWeapon/spine/武器/弓箭.meta
similarity index 70%
rename from assets/res/spine/likeRole/数字16.meta
rename to assets/res/battleGameWeapon/spine/武器/弓箭.meta
index b9b4947..e895991 100644
--- a/assets/res/spine/likeRole/数字16.meta
+++ b/assets/res/battleGameWeapon/spine/武器/弓箭.meta
@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "33ee6650-1a2e-4f50-b1fb-58af5d17b040",
+  "uuid": "eb35c200-5b5d-4731-b8d8-36df41c2a926",
   "files": [],
   "subMetas": {},
   "userData": {}
diff --git a/assets/res/battleGameWeapon/spine/武器/弓箭/.WeDrive b/assets/res/battleGameWeapon/spine/武器/弓箭/.WeDrive
new file mode 100644
index 0000000..c82be07
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/弓箭/.WeDrive
@@ -0,0 +1 @@
+D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\弓箭
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas
new file mode 100644
index 0000000..a80ef76
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas
@@ -0,0 +1,125 @@
+
+弓类武器+专属技能.png
+size: 498,523
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+技能落地受击1
+  rotate: true
+  xy: 319, 255
+  size: 79, 45
+  orig: 89, 53
+  offset: 5, 3
+  index: -1
+技能落地受击2
+  rotate: true
+  xy: 319, 336
+  size: 100, 55
+  orig: 113, 78
+  offset: 6, 3
+  index: -1
+技能落地受击3
+  rotate: true
+  xy: 412, 0
+  size: 111, 67
+  orig: 120, 76
+  offset: 3, 4
+  index: -1
+技能落地受击4
+  rotate: false
+  xy: 192, 1
+  size: 118, 61
+  orig: 128, 71
+  offset: 1, 5
+  index: -1
+波纹
+  rotate: false
+  xy: 0, 279
+  size: 163, 61
+  orig: 165, 63
+  offset: 1, 1
+  index: -1
+火焰1
+  rotate: false
+  xy: 0, 342
+  size: 224, 94
+  orig: 240, 104
+  offset: 7, 5
+  index: -1
+火焰11
+  rotate: true
+  xy: 99, 7
+  size: 208, 91
+  orig: 225, 101
+  offset: 9, 4
+  index: -1
+火焰3
+  rotate: true
+  xy: 319, 32
+  size: 221, 91
+  orig: 237, 102
+  offset: 7, 6
+  index: -1
+火焰5
+  rotate: true
+  xy: 226, 206
+  size: 230, 91
+  orig: 261, 101
+  offset: 7, 5
+  index: -1
+火焰7
+  rotate: true
+  xy: 379, 255
+  size: 268, 91
+  orig: 280, 100
+  offset: 7, 5
+  index: -1
+火焰9
+  rotate: true
+  xy: 0, 29
+  size: 224, 97
+  orig: 245, 105
+  offset: 7, 4
+  index: -1
+特效
+  rotate: false
+  xy: 412, 113
+  size: 86, 140
+  orig: 86, 140
+  offset: 0, 0
+  index: -1
+通用拖尾
+  rotate: false
+  xy: 0, 438
+  size: 377, 85
+  orig: 424, 92
+  offset: 13, 3
+  index: -1
+龙头
+  rotate: true
+  xy: 192, 64
+  size: 140, 121
+  orig: 156, 133
+  offset: 6, 6
+  index: -1
+龙舌弓/弓类/弓
+  rotate: false
+  xy: 165, 217
+  size: 49, 123
+  orig: 50, 123
+  offset: 1, 0
+  index: -1
+龙舌弓/弓类/箭矢
+  rotate: true
+  xy: 472, 341
+  size: 88, 17
+  orig: 93, 23
+  offset: 2, 4
+  index: -1
+龙舌弓/弓类/箭矢2
+  rotate: true
+  xy: 472, 431
+  size: 92, 21
+  orig: 93, 23
+  offset: 0, 2
+  index: -1
diff --git a/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas.meta b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas.meta
new file mode 100644
index 0000000..65881bf
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas.meta
@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "33badaf2-314f-4269-93e9-de5514b5d580",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json
new file mode 100644
index 0000000..0cb7690
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"JrGIj+D/kFCJw6eSSGG/yzWFjlQ","spine":"3.8.75","x":-63.82,"y":-46.14,"width":75.99,"height":95.48,"images":"./images/弓类/","audio":"C:/Users/EDY/Desktop/"},"bones":[{"name":"root","scaleX":1.25,"scaleY":1.25},{"name":"bone","parent":"root","length":24.25,"rotation":-89.41,"x":-7.88,"y":1.51,"scaleX":0.65,"scaleY":0.65},{"name":"bone2","parent":"bone","x":-2.15,"y":-14.81},{"name":"bone3","parent":"bone","x":-45.27,"y":21.12},{"name":"bone4","parent":"bone","x":45.61,"y":18.82},{"name":"bone5","parent":"bone","x":-2.08,"y":21.12},{"name":"弓类/箭矢","parent":"bone5","length":31.41,"rotation":-91.42,"x":0.04,"y":-40.15},{"name":"bone6","parent":"root","length":26.14,"x":-0.68,"y":3.51},{"name":"弓类/龙头","parent":"root","x":-73.71,"y":3.77,"scaleX":0.5,"scaleY":0.5},{"name":"火焰","parent":"弓类/龙头","length":85.06,"rotation":-0.26,"x":-0.25},{"name":"火焰2","parent":"弓类/龙头","length":85.06,"rotation":-0.26,"x":-0.25},{"name":"特效3","parent":"root","length":36.43,"rotation":-1.25,"x":-71.94,"y":48.75},{"name":"特效4","parent":"root","length":36.43,"rotation":-1.25,"x":-71.94,"y":48.75,"scaleY":-1},{"name":"弓类/箭矢2","parent":"bone5","length":31.41,"rotation":-91.42,"x":0.04,"y":-40.15},{"name":"弓类/箭矢3","parent":"bone5","length":31.41,"rotation":-91.42,"x":0.04,"y":-40.15}],"slots":[{"name":"特效3","bone":"特效3"},{"name":"特效4","bone":"特效4"},{"name":"弓类/通用拖尾","bone":"火焰"},{"name":"弓类/通用拖尾2","bone":"火焰2"},{"name":"火焰","bone":"弓类/龙头"},{"name":"弓类/龙头","bone":"弓类/龙头"},{"name":"弓类/技能落地受击1","bone":"root"},{"name":"弓类/波纹","bone":"bone6"},{"name":"弓类/弓","bone":"bone","attachment":"龙舌弓/弓类/弓"},{"name":"弓类/箭矢8","bone":"弓类/箭矢3"},{"name":"弓类/箭矢3","bone":"弓类/箭矢"},{"name":"弓类/箭矢4","bone":"弓类/箭矢2"},{"name":"弓类/箭矢7","bone":"弓类/箭矢3"},{"name":"弓类/箭矢2","bone":"弓类/箭矢","attachment":"龙舌弓/弓类/箭矢2"},{"name":"弓类/箭矢5","bone":"弓类/箭矢2"},{"name":"弓类/箭矢","bone":"弓类/箭矢","blend":"additive"},{"name":"弓类/箭矢6","bone":"弓类/箭矢2","blend":"additive"},{"name":"弓类/箭矢9","bone":"弓类/箭矢3","blend":"additive"}],"skins":[{"name":"default","attachments":{"弓类/弓":{"龙舌弓/弓类/弓":{"type":"mesh","uvs":[0.88945,0.14496,0.92933,0.12956,0.94412,0.09431,0.99629,0.0716,0.98672,0.0394,0.90151,0.00414,0.80586,0.00448,0.70673,0.03906,0.70325,0.10685,0.61455,0.14245,0.43977,0.17533,0.2476,0.22482,0.14011,0.28041,0.02185,0.36041,0.02358,0.65329,0.13663,0.72177,0.27924,0.78888,0.44793,0.83363,0.60445,0.86685,0.7175,0.90956,0.67402,0.94821,0.68793,0.96922,0.82532,1,0.9575,0.97736,0.97141,0.92651,0.88619,0.86888,0.86011,0.85736,0.88098,0.50821,0.88793,0.15973,0.79402,0.1838,0.78532,0.50922,0.77264,0.81344,0.64112,0.78371,0.51749,0.75294,0.43332,0.71295,0.40175,0.67296,0.48593,0.61451,0.4754,0.36431,0.41227,0.31817,0.47014,0.27305,0.58588,0.22895,0.73845,0.19306,0.79236,0.1808,0.88628,0.15571],"triangles":[27,31,30,29,27,30,11,10,39,27,29,28,39,10,40,40,9,41,40,10,9,41,9,42,9,8,42,43,42,0,0,42,8,1,0,2,2,0,8,2,8,7,7,6,2,6,5,2,2,4,3,2,5,4,16,15,34,15,35,34,15,14,35,35,14,36,36,13,37,37,13,38,38,13,12,14,13,36,12,11,38,38,11,39,24,23,22,22,21,19,24,22,19,21,20,19,19,25,24,19,26,25,26,19,31,19,18,31,18,32,31,18,17,32,26,31,27,17,33,32,17,16,33,16,34,33],"vertices":[1,3,3.72,1.5,1,1,3,1.92,3.35,1,1,3,-2.23,4.07,1,1,3,-4.89,6.5,1,1,3,-8.69,6.1,1,1,3,-12.89,2.22,1,1,3,-12.9,-2.18,1,1,3,-8.87,-6.78,1,1,3,-0.87,-7.02,1,1,3,3.29,-11.14,1,2,2,-36.03,16.71,0.05668,3,7.09,-19.22,0.94332,2,2,-30.28,7.81,0.63438,3,12.84,-28.12,0.36562,2,2,-23.78,2.8,0.77714,3,19.34,-33.14,0.22286,2,2,-14.39,-2.74,0.90906,3,28.73,-38.67,0.09094,2,4,-27.6,-36.65,0.1684,2,20.17,-3.02,0.8316,2,4,-19.46,-31.54,0.29367,2,28.3,2.1,0.70633,2,4,-11.48,-25.06,0.49093,2,36.29,8.58,0.50907,2,4,-6.12,-17.35,0.69904,2,41.65,16.28,0.30096,3,4,-2.12,-10.19,0.88389,2,45.64,23.44,0.11408,5,45.57,-12.5,0.00203,2,4,2.97,-5.05,0.9908,2,50.73,28.59,0.0092,2,4,7.51,-7.09,0.99991,2,55.27,26.54,9.0E-5,1,4,10,-6.48,1,1,4,13.69,-0.2,1,1,4,11.08,5.91,1,1,4,5.09,6.61,1,3,4,-1.75,2.76,0.99297,2,46.01,36.4,0.00107,5,45.95,0.46,0.00596,3,4,-3.12,1.58,0.97677,2,44.64,35.21,0.00665,5,44.57,-0.73,0.01658,2,4,-44.31,2.96,0.02333,5,3.39,0.66,0.97667,1,3,5.46,1.41,1,1,3,8.25,-2.94,1,2,4,-44.23,-1.44,0.02578,5,3.46,-3.74,0.97422,3,4,-8.34,-2.39,0.89528,2,39.42,31.24,0.03979,5,39.35,-4.7,0.06493,3,4,-11.92,-8.41,0.79707,2,35.85,25.23,0.19722,5,35.78,-10.71,0.00571,3,4,-15.6,-14.06,0.616,2,32.16,19.58,0.38393,5,32.09,-16.36,8.0E-5,2,4,-20.36,-17.88,0.42296,2,27.4,15.76,0.57704,2,4,-25.1,-19.28,0.26879,2,22.67,14.35,0.73121,2,4,-31.95,-15.34,0.13425,2,15.81,18.3,0.86575,3,4,-61.48,-15.52,5.0E-5,2,-13.72,18.12,0.87696,3,29.4,-17.82,0.12299,2,2,-19.19,15.27,0.76669,3,23.93,-20.66,0.23331,2,2,-24.49,17.99,0.57985,3,18.63,-17.95,0.42015,1,3,13.48,-12.57,1,1,3,9.32,-5.51,1,1,3,7.9,-3.01,1,1,3,4.98,1.34,1],"hull":44,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,62,62,64,64,66,66,68,68,70,70,72,72,74,74,76,76,78,78,80,80,82,82,84,84,86,0,86],"width":50,"height":123}},"弓类/技能落地受击1":{"技能落地受击1":{"x":-0.5,"y":7.5,"width":89,"height":53},"技能落地受击2":{"x":2.5,"y":17,"width":113,"height":78},"技能落地受击3":{"x":2,"y":17,"width":120,"height":76},"技能落地受击4":{"x":2,"y":17.5,"width":128,"height":71}},"弓类/通用拖尾":{"通用拖尾":{"x":156.1,"y":2.35,"rotation":0.26,"width":424,"height":92}},"弓类/箭矢":{"龙舌弓/弓类/箭矢":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"火焰":{"火焰1":{"x":97.07,"y":-0.37,"width":240,"height":104},"火焰3":{"x":94.57,"y":1.63,"width":237,"height":102},"火焰5":{"x":108.57,"y":-0.87,"width":261,"height":101},"火焰7":{"x":123.07,"y":-1.37,"width":280,"height":100},"火焰9":{"x":106.57,"y":1.13,"width":245,"height":105},"火焰11":{"x":97.57,"y":-0.87,"width":225,"height":101}},"弓类/龙头":{"龙头":{"x":10.07,"y":-0.87,"width":156,"height":133}},"特效3":{"特效":{"x":54.9,"y":10.95,"rotation":-90.26,"width":86,"height":140}},"特效4":{"特效":{"x":54.9,"y":10.95,"rotation":-90.26,"width":86,"height":140}},"弓类/通用拖尾2":{"通用拖尾":{"x":156.1,"y":2.35,"rotation":0.26,"width":424,"height":92}},"弓类/箭矢2":{"龙舌弓/弓类/箭矢2":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/箭矢3":{"龙舌弓/弓类/箭矢":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/箭矢4":{"龙舌弓/弓类/箭矢":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/箭矢5":{"龙舌弓/弓类/箭矢2":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/箭矢6":{"龙舌弓/弓类/箭矢":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/箭矢7":{"龙舌弓/弓类/箭矢":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/箭矢8":{"龙舌弓/弓类/箭矢2":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/箭矢9":{"龙舌弓/弓类/箭矢":{"x":0.88,"y":-0.03,"rotation":-179.17,"width":93,"height":23}},"弓类/波纹":{"波纹":{"x":3.18,"y":-2.61,"width":165,"height":63}}}}],"animations":{"待机":{"bones":{"bone":{"rotate":[{"angle":19.67},{"time":0.5,"angle":21.73},{"time":1,"angle":19.67}],"translate":[{"x":-3.66,"y":-0.23},{"time":0.5,"x":-4.81,"y":-3.44},{"time":1,"x":-3.66,"y":-0.23}]}}},"技能落地效果":{"slots":{"弓类/技能落地受击1":{"attachment":[{"time":0.0333,"name":"技能落地受击1"},{"time":0.1,"name":"技能落地受击2"},{"time":0.1667,"name":"技能落地受击3"},{"time":0.2333,"name":"技能落地受击4"},{"time":0.3,"name":null}]},"弓类/箭矢2":{"attachment":[{"name":null}]},"弓类/弓":{"attachment":[{"name":null}]},"弓类/波纹":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.3667,"color":"ffffff00"}],"attachment":[{"time":0.0667,"name":"波纹"}]}},"bones":{"bone":{"rotate":[{"angle":19.67}],"translate":[{"x":-3.66,"y":-0.23}]},"bone6":{"translate":[{"time":0.0667,"x":-1.74}],"scale":[{"time":0.0667,"x":0.198,"y":0.198},{"time":0.3667,"curve":"stepped"},{"time":0.5}]}}},"攻击":{"slots":{"弓类/箭矢2":{"attachment":[{"time":0.4667,"name":null}]}},"bones":{"bone":{"rotate":[{"angle":19.67},{"time":0.2,"angle":-1.33,"curve":"stepped"},{"time":0.4333,"angle":-1.33},{"time":0.5,"angle":0.9},{"time":0.5667,"angle":-1.33,"curve":"stepped"},{"time":0.6333,"angle":-1.33},{"time":1,"angle":19.67}],"translate":[{"x":-3.66,"y":-0.23},{"time":0.2,"x":-7.1,"y":4.12,"curve":"stepped"},{"time":0.4333,"x":-7.1,"y":4.12},{"time":0.5,"x":-14.88,"y":1.37},{"time":0.5667,"x":-3.89,"y":2.52},{"time":0.6333,"x":-7.1,"y":4.12},{"time":1,"x":-3.66,"y":-5.72},{"time":1.5,"x":-3.66,"y":-0.23}],"scale":[{},{"time":0.4333,"x":1.344,"y":1.344,"curve":"stepped"},{"time":0.6,"x":1.344,"y":1.344},{"time":1}]},"bone3":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.1,"y":7.56},{"time":0.5,"x":0.08,"y":-6.18},{"time":0.5667}]},"bone4":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.1,"y":7.56},{"time":0.5,"x":0.08,"y":-6.18},{"time":0.5667}]},"bone5":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.31,"y":24.27},{"time":0.5,"x":0.03,"y":-2.52},{"time":0.5667}]}}},"攻击2":{"slots":{"弓类/箭矢5":{"attachment":[{"name":"龙舌弓/弓类/箭矢2"},{"time":0.4667,"name":null}]},"弓类/箭矢2":{"attachment":[{"time":0.4667,"name":null}]},"弓类/箭矢8":{"attachment":[{"name":"龙舌弓/弓类/箭矢2"},{"time":0.4667,"name":null}]}},"bones":{"bone":{"rotate":[{"angle":19.67},{"time":0.2,"angle":-1.33,"curve":"stepped"},{"time":0.4333,"angle":-1.33},{"time":0.5,"angle":0.9},{"time":0.5667,"angle":-1.33,"curve":"stepped"},{"time":0.6333,"angle":-1.33},{"time":1,"angle":19.67}],"translate":[{"x":-3.66,"y":-0.23},{"time":0.2,"x":-7.1,"y":4.12,"curve":"stepped"},{"time":0.4333,"x":-7.1,"y":4.12},{"time":0.5,"x":-14.88,"y":1.37},{"time":0.5667,"x":-3.89,"y":2.52},{"time":0.6333,"x":-7.1,"y":4.12},{"time":1,"x":-3.66,"y":-5.72},{"time":1.5,"x":-3.66,"y":-0.23}],"scale":[{},{"time":0.4333,"x":1.344,"y":1.344,"curve":"stepped"},{"time":0.6,"x":1.344,"y":1.344},{"time":1}]},"bone3":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.1,"y":7.56},{"time":0.5,"x":0.08,"y":-6.18},{"time":0.5667}]},"bone4":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.1,"y":7.56},{"time":0.5,"x":0.08,"y":-6.18},{"time":0.5667}]},"bone5":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.31,"y":24.27},{"time":0.5,"x":0.03,"y":-2.52},{"time":0.5667}]},"弓类/箭矢":{"rotate":[{"angle":-8.99}],"translate":[{"x":-6.12,"y":-0.45}]},"弓类/箭矢2":{"rotate":[{"angle":10.31}],"translate":[{"x":7.91,"y":-1.3}]},"弓类/箭矢3":{"rotate":[{"angle":10.31}],"translate":[{"x":7.91,"y":-1.3}]}}},"攻击3":{"slots":{"弓类/箭矢5":{"attachment":[{"name":"龙舌弓/弓类/箭矢2"},{"time":0.4667,"name":null}]},"弓类/箭矢2":{"attachment":[{"time":0.4667,"name":null}]},"弓类/箭矢8":{"attachment":[{"name":"龙舌弓/弓类/箭矢2"},{"time":0.4667,"name":null}]}},"bones":{"bone":{"rotate":[{"angle":19.67},{"time":0.2,"angle":-1.33,"curve":"stepped"},{"time":0.4333,"angle":-1.33},{"time":0.5,"angle":0.9},{"time":0.5667,"angle":-1.33,"curve":"stepped"},{"time":0.6333,"angle":-1.33},{"time":1,"angle":19.67}],"translate":[{"x":-3.66,"y":-0.23},{"time":0.2,"x":-7.1,"y":4.12,"curve":"stepped"},{"time":0.4333,"x":-7.1,"y":4.12},{"time":0.5,"x":-14.88,"y":1.37},{"time":0.5667,"x":-3.89,"y":2.52},{"time":0.6333,"x":-7.1,"y":4.12},{"time":1,"x":-3.66,"y":-5.72},{"time":1.5,"x":-3.66,"y":-0.23}],"scale":[{},{"time":0.4333,"x":1.344,"y":1.344,"curve":"stepped"},{"time":0.6,"x":1.344,"y":1.344},{"time":1}]},"bone3":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.1,"y":7.56},{"time":0.5,"x":0.08,"y":-6.18},{"time":0.5667}]},"bone4":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.1,"y":7.56},{"time":0.5,"x":0.08,"y":-6.18},{"time":0.5667}]},"bone5":{"translate":[{"time":0.1},{"time":0.4333,"x":-0.31,"y":24.27},{"time":0.5,"x":0.03,"y":-2.52},{"time":0.5667}]},"弓类/箭矢":{"rotate":[{"angle":-18.16}],"translate":[{"x":-12.36,"y":0.23}]},"弓类/箭矢2":{"rotate":[{"angle":0.47}],"translate":[{"x":2.93,"y":-3.79}]},"弓类/箭矢3":{"rotate":[{"angle":17.56}],"translate":[{"x":17.35,"y":0.09}]}}},"火龙箭矢":{"slots":{"弓类/箭矢2":{"attachment":[{"name":null}]},"弓类/弓":{"attachment":[{"name":null}]},"弓类/通用拖尾2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf"}],"attachment":[{"name":"通用拖尾"}]},"弓类/通用拖尾":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00"}],"attachment":[{"name":"通用拖尾"}]},"弓类/龙头":{"attachment":[{"name":"龙头"}]},"火焰":{"attachment":[{"name":"火焰1"},{"time":0.1,"name":"火焰3"},{"time":0.2,"name":"火焰5"},{"time":0.2667,"name":"火焰7"},{"time":0.3667,"name":"火焰9"},{"time":0.4333,"name":"火焰11"}]}},"bones":{"bone":{"scale":[{"x":1.344,"y":1.344}]},"弓类/龙头":{"translate":[{"x":25.25}]},"火焰":{"rotate":[{"angle":-1.38}],"translate":[{"y":-1.24}],"scale":[{"x":0.689},{"time":0.4667,"x":0.899,"curve":"stepped"},{"time":0.5,"x":0.689}]},"火焰2":{"rotate":[{"angle":-1.38}],"translate":[{"y":-1.24}],"scale":[{"x":0.794},{"time":0.2333,"x":0.899,"curve":"stepped"},{"time":0.2667,"x":0.689},{"time":0.5,"x":0.794}]}}},"飞行箭矢":{"slots":{"弓类/箭矢3":{"attachment":[{"name":"龙舌弓/弓类/箭矢"}]},"弓类/箭矢2":{"attachment":[{"name":null}]},"弓类/箭矢":{"attachment":[{"name":"龙舌弓/弓类/箭矢"}]},"弓类/弓":{"attachment":[{"name":null}]},"弓类/箭矢7":{"attachment":[{"name":"龙舌弓/弓类/箭矢"}]},"弓类/箭矢4":{"attachment":[{"name":"龙舌弓/弓类/箭矢"}]},"特效3":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff"},{"time":0.5,"color":"ffffff00"}],"attachment":[{"name":"特效"}]},"特效4":{"color":[{"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff"}],"attachment":[{"name":"特效"}]}},"bones":{"bone":{"scale":[{"x":1.344,"y":1.344}]},"特效3":{"translate":[{"x":42.39,"y":-45.57},{"time":0.4667,"x":45.4,"y":-45.57}],"scale":[{"y":0.429},{"time":0.4667,"x":1.351,"y":0.429}]},"特效4":{"translate":[{"x":43.89,"y":-45.57},{"time":0.2333,"x":45.4,"y":-45.57},{"time":0.2667,"x":42.39,"y":-45.57},{"time":0.5,"x":43.89,"y":-45.57}],"scale":[{"x":1.175,"y":0.429},{"time":0.2333,"x":1.351,"y":0.429},{"time":0.2667,"y":0.429},{"time":0.5,"x":1.175,"y":0.429}]},"弓类/箭矢":{"translate":[{"x":0.59,"y":38.53}]},"弓类/箭矢2":{"translate":[{"x":0.59,"y":38.53}]},"弓类/箭矢3":{"translate":[{"x":0.59,"y":38.53}]}}}}}
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json.meta b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json.meta
new file mode 100644
index 0000000..2c8a6e0
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "2cfd40d1-8308-45e0-9d48-fc9918263deb",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "33badaf2-314f-4269-93e9-de5514b5d580"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png
new file mode 100644
index 0000000..58bde06
Binary files /dev/null and b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png differ
diff --git a/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png.meta b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png.meta
new file mode 100644
index 0000000..c19db94
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@6c48a",
+      "displayName": "弓类武器+专属技能",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@f9941",
+      "displayName": "弓类武器+专属技能",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 498,
+        "height": 523,
+        "rawWidth": 498,
+        "rawHeight": 523,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -249,
+            -261.5,
+            0,
+            249,
+            -261.5,
+            0,
+            -249,
+            261.5,
+            0,
+            249,
+            261.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            523,
+            498,
+            523,
+            0,
+            0,
+            498,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -249,
+            -261.5,
+            0
+          ],
+          "maxPos": [
+            249,
+            261.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@6c48a"
+  }
+}
diff --git a/assets/res/spine/likeRole/数字1024.meta b/assets/res/battleGameWeapon/spine/武器/木棍.meta
similarity index 70%
rename from assets/res/spine/likeRole/数字1024.meta
rename to assets/res/battleGameWeapon/spine/武器/木棍.meta
index c17a9a4..18c0acf 100644
--- a/assets/res/spine/likeRole/数字1024.meta
+++ b/assets/res/battleGameWeapon/spine/武器/木棍.meta
@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "043f5156-460e-4fa1-ba45-7dcf8129ed16",
+  "uuid": "21f36989-5cc4-4157-8a7b-37ebec7a6a79",
   "files": [],
   "subMetas": {},
   "userData": {}
diff --git a/assets/res/battleGameWeapon/spine/武器/木棍/.WeDrive b/assets/res/battleGameWeapon/spine/武器/木棍/.WeDrive
new file mode 100644
index 0000000..5bca22d
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/木棍/.WeDrive
@@ -0,0 +1 @@
+D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\木棍
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas
new file mode 100644
index 0000000..67b1210
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas
@@ -0,0 +1,153 @@
+
+棍类武器+专属技能.png
+size: 1774,1292
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+AOE光圈扩散1
+  rotate: false
+  xy: 1638, 474
+  size: 102, 102
+  orig: 114, 113
+  offset: 6, 5
+  index: -1
+AOE光圈扩散2
+  rotate: false
+  xy: 835, 9
+  size: 227, 226
+  orig: 241, 239
+  offset: 7, 6
+  index: -1
+AOE光圈扩散3
+  rotate: false
+  xy: 1053, 906
+  size: 380, 386
+  orig: 403, 408
+  offset: 10, 12
+  index: -1
+AOE光圈扩散4
+  rotate: false
+  xy: 0, 153
+  size: 542, 546
+  orig: 564, 576
+  offset: 12, 15
+  index: -1
+AOE光圈扩散5
+  rotate: false
+  xy: 0, 701
+  size: 580, 591
+  orig: 606, 626
+  offset: 10, 14
+  index: -1
+光效32
+  rotate: false
+  xy: 582, 828
+  size: 469, 464
+  orig: 500, 484
+  offset: 31, 10
+  index: -1
+击中光1
+  rotate: true
+  xy: 1598, 89
+  size: 214, 173
+  orig: 235, 191
+  offset: 11, 8
+  index: -1
+击中光2
+  rotate: true
+  xy: 1388, 46
+  size: 257, 208
+  orig: 279, 226
+  offset: 11, 8
+  index: -1
+击中光3
+  rotate: false
+  xy: 544, 49
+  size: 289, 239
+  orig: 310, 258
+  offset: 10, 9
+  index: -1
+击中光4
+  rotate: false
+  xy: 1064, 0
+  size: 322, 265
+  orig: 345, 285
+  offset: 11, 10
+  index: -1
+击中光5
+  rotate: false
+  xy: 1311, 305
+  size: 325, 271
+  orig: 347, 291
+  offset: 10, 9
+  index: -1
+击中光6
+  rotate: false
+  xy: 1435, 767
+  size: 330, 279
+  orig: 353, 299
+  offset: 10, 9
+  index: -1
+如意金箍棒/棍类/如意金箍棒
+  rotate: true
+  xy: 359, 34
+  size: 117, 183
+  orig: 117, 183
+  offset: 0, 0
+  index: -1
+如意金箍棒/火焰环
+  rotate: false
+  xy: 582, 649
+  size: 410, 177
+  orig: 500, 484
+  offset: 47, 75
+  index: -1
+如意金箍棒/火焰环23
+  rotate: true
+  xy: 852, 237
+  size: 410, 177
+  orig: 500, 484
+  offset: 47, 75
+  index: -1
+棍圆
+  rotate: false
+  xy: 544, 290
+  size: 306, 357
+  orig: 343, 396
+  offset: 25, 25
+  index: -1
+棍圆21
+  rotate: true
+  xy: 1053, 598
+  size: 306, 357
+  orig: 343, 396
+  offset: 25, 25
+  index: -1
+金箍棒1
+  rotate: false
+  xy: 0, 52
+  size: 357, 99
+  orig: 357, 99
+  offset: 0, 0
+  index: -1
+金箍棒2
+  rotate: false
+  xy: 1435, 1048
+  size: 339, 244
+  orig: 376, 408
+  offset: 0, 3
+  index: -1
+金箍棒3
+  rotate: false
+  xy: 1031, 267
+  size: 278, 329
+  orig: 382, 390
+  offset: 0, 6
+  index: -1
+金箍棒4
+  rotate: true
+  xy: 1412, 578
+  size: 187, 343
+  orig: 392, 346
+  offset: 2, 3
+  index: -1
diff --git a/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas.meta b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas.meta
new file mode 100644
index 0000000..810759a
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas.meta
@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "2499632f-2735-42d7-a814-72d005443c28",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json
new file mode 100644
index 0000000..ba31da3
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"b+ZpsEcjIsuq3QEdWTbfaiz3CV0","spine":"3.8.75","x":-45.75,"y":-42.74,"width":94.87,"height":108.3,"images":"./images/棍类/","audio":"C:/Users/EDY/Desktop/"},"bones":[{"name":"root"},{"name":"bone2","parent":"root","length":35.52,"rotation":-1.29,"y":-0.57},{"name":"棍类/九齿钉耙","parent":"bone2","length":50,"rotation":93.3,"x":3.81,"y":-19.22,"scaleX":0.5,"scaleY":0.5},{"name":"bone5","parent":"root","x":-30.5,"y":-14.54},{"name":"bone","parent":"bone5","length":43.29,"rotation":47.64,"x":6.05,"y":0.47,"scaleX":0.7334,"scaleY":0.7334},{"name":"棍类/九齿钉耙2","parent":"棍类/九齿钉耙","length":33.83,"rotation":0.74,"x":50.1,"y":-0.23},{"name":"棍类/九齿钉耙6","parent":"棍类/九齿钉耙2","length":28.85,"rotation":57.75,"x":8.97,"y":-18.51},{"name":"棍类/菩提灵棍","parent":"棍类/九齿钉耙6","rotation":-58.48,"x":16.48,"y":4.86},{"name":"bone3","parent":"bone5","length":43.29,"rotation":34.23,"x":6.05,"y":0.47,"scaleX":0.7334,"scaleY":0.7334},{"name":"bone4","parent":"root","x":-99.33,"y":-48.7,"scaleX":0.5,"scaleY":0.5},{"name":"棍类/金箍棒1","parent":"bone4","length":117.97,"rotation":176.89,"x":168.96,"y":37.84},{"name":"棍类/金箍棒2","parent":"bone4","length":105.37,"rotation":160.19,"x":168.43,"y":35.18},{"name":"棍类/金箍棒3","parent":"bone4","length":98.31,"rotation":141.83,"x":168.96,"y":37.31},{"name":"棍类/金箍棒4","parent":"bone4","length":88.48,"rotation":121.2,"x":168.96,"y":37.31},{"name":"击中光","parent":"bone4","length":58.1,"rotation":-90.53,"x":-144.44,"y":69.82},{"name":"棍类/九齿钉耙3","parent":"棍类/九齿钉耙2","length":30.96,"rotation":-1.03,"x":33.83},{"name":"棍类/九齿钉耙4","parent":"棍类/九齿钉耙3","length":29.54,"rotation":1.11,"x":30.96},{"name":"棍类/九齿钉耙5","parent":"棍类/九齿钉耙4","length":23.5,"rotation":-4.07,"x":29.54},{"name":"棍类/金箍棒5","parent":"棍类/金箍棒1","length":59.81,"rotation":-4.59,"x":118.27,"y":-1.74},{"name":"棍类/金箍棒6","parent":"棍类/金箍棒5","length":77.34,"rotation":-1.44,"x":59.81},{"name":"棍类/金箍棒7","parent":"棍类/金箍棒6","length":80.01,"rotation":-2.02,"x":77.34},{"name":"AOE光圈扩散1","parent":"root","length":53.83,"rotation":-1.88,"x":4.21,"y":-27.52}],"slots":[{"name":"击中光","bone":"击中光"},{"name":"棍类/金箍棒2","bone":"棍类/金箍棒2"},{"name":"棍类/金箍棒3","bone":"棍类/金箍棒3"},{"name":"棍类/金箍棒4","bone":"棍类/金箍棒4"},{"name":"棍类/金箍棒1","bone":"棍类/金箍棒1"},{"name":"棍类/棍圆","bone":"bone"},{"name":"棍类/棍圆2","bone":"bone3"},{"name":"棍类/如意金箍棒","bone":"棍类/菩提灵棍","attachment":"如意金箍棒/棍类/如意金箍棒"},{"name":"AOE光圈扩散1","bone":"AOE光圈扩散1"},{"name":"root222","bone":"root"},{"name":"如意金箍棒/火焰环","bone":"bone"},{"name":"如意金箍棒/火焰环5","bone":"bone"},{"name":"如意金箍棒/火焰环3","bone":"bone3"},{"name":"如意金箍棒/火焰环2","bone":"bone","blend":"additive"},{"name":"如意金箍棒/火焰环4","bone":"bone3","blend":"additive"},{"name":"光效32","bone":"bone"}],"skins":[{"name":"default","attachments":{"棍类/如意金箍棒":{"如意金箍棒/棍类/如意金箍棒":{"x":-1.13,"y":3.24,"rotation":-120.29,"width":117,"height":183},"如意金箍棒/棍类/如意金箍棒2":{"type":"mesh","path":"如意金箍棒/棍类/如意金箍棒","uvs":[0.18259,0.00157,0.08191,0,0.01832,0.01512,0,0.08288,0.05011,0.14217,0.10215,0.20344,0.16266,0.27115,0.24435,0.3669,0.31243,0.44138,0.39261,0.52069,0.47279,0.60967,0.54086,0.67448,0.61348,0.76926,0.68155,0.836,0.7345,0.89403,0.7814,0.9569,0.81771,1,0.94478,1,1,0.9627,1,0.92015,0.95235,0.87372,0.87217,0.78474,0.78291,0.68028,0.71332,0.61161,0.65735,0.54777,0.58625,0.47039,0.52876,0.40269,0.44858,0.30984,0.39109,0.24213,0.32453,0.15798,0.26402,0.10285,0.20048,0.02258,0.8897,0.92545,0.78816,0.82159,0.66816,0.69175,0.57031,0.57962,0.4817,0.48637,0.40416,0.39077,0.33401,0.32585,0.27493,0.25739,0.21585,0.17949,0.15678,0.10867,0.10878,0.05201],"triangles":[42,1,0,42,0,31,2,1,42,3,2,42,41,42,31,41,31,30,4,3,42,4,42,41,40,41,30,40,30,29,39,29,28,5,4,41,5,41,40,39,40,29,6,5,40,6,40,39,38,28,27,38,39,28,7,6,39,7,39,38,37,38,27,7,38,37,8,7,37,37,27,26,36,37,26,36,26,25,8,37,36,9,8,36,35,36,25,10,9,36,35,25,24,10,36,35,35,24,23,11,10,35,11,35,23,34,11,23,34,23,22,12,11,34,33,22,21,34,22,33,12,34,33,13,12,33,33,21,20,14,13,33,32,14,33,20,32,33,32,20,19,15,14,32,32,19,18,16,15,32,17,32,18,16,32,17],"vertices":[2,16,45.07,-13.43,1.6E-4,17,16.44,-12.29,0.99984,1,17,22.05,-1.93,1,1,17,22.97,5.95,1,2,16,43.36,12.55,0.01179,17,12.9,13.5,0.98821,2,16,31.04,13.14,0.44685,17,0.57,13.21,0.55315,3,15,48.99,14.07,6.4E-4,16,18.3,13.72,0.98098,17,-12.18,12.88,0.01837,2,15,34.72,14.13,0.2878,16,4.03,14.06,0.7122,3,5,48.86,14.35,0.01077,15,14.76,14.61,0.98639,16,-15.91,14.93,0.00284,2,5,33.08,14.55,0.56293,15,-1.02,14.53,0.43707,2,2,65.72,13.96,0.00305,5,15.8,13.99,0.99695,2,2,46.93,14.08,0.64676,5,-2.99,14.34,0.35324,2,2,32.67,13.18,0.99699,5,-17.25,13.63,0.00301,1,2,13.4,14.59,1,1,2,-1.16,13.87,1,1,2,-13.45,13.88,1,1,2,-26.15,14.94,1,1,2,-35.11,15.25,1,1,2,-42.61,2.42,1,1,2,-39.97,-6.61,1,1,2,-33.25,-10.53,1,1,2,-23.1,-10,1,1,2,-4.31,-10.12,1,1,2,17.47,-10.74,1,1,2,32.43,-10.05,1,2,2,45.82,-10.28,0.82473,5,-4.41,-10,0.17526,2,2,62.24,-10.24,0.00106,5,12.01,-10.17,0.99894,2,5,26.1,-10.79,0.94432,15,-7.54,-10.93,0.05568,2,5,45.49,-11.51,0.01011,15,11.86,-11.3,0.98989,2,15,25.96,-11.67,0.82187,16,-5.23,-11.57,0.17813,2,15,43.19,-12.62,0.00623,16,11.98,-12.86,0.99377,2,16,24.27,-12.01,0.81012,17,-4.4,-12.35,0.18988,2,16,40.69,-13.23,0.01915,17,12.07,-12.41,0.98085,1,2,-27.58,1.1,1,1,2,-5.17,1.77,1,1,2,22.43,1.91,1,2,2,45.92,1.45,0.9759,5,-4.16,1.73,0.0241,1,5,15.81,1.82,1,2,5,35.48,0.57,0.09881,15,1.63,0.6,0.90119,1,15,16.03,1.77,1,2,15,30.33,1.5,0.65332,16,-0.6,1.51,0.34668,1,16,15.18,0.06,1,2,16,29.85,-0.72,0.4103,17,0.36,-0.69,0.5897,1,17,12.15,-0.4,1],"hull":32,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,62,0,62],"width":117,"height":183}},"如意金箍棒/火焰环2":{"如意金箍棒/火焰环":{"x":56.01,"y":-1.7,"scaleX":0.8252,"scaleY":0.8252,"rotation":84.82,"width":500,"height":484}},"如意金箍棒/火焰环3":{"如意金箍棒/火焰环23":{"x":56.01,"y":-1.7,"scaleX":0.8252,"scaleY":0.8252,"rotation":84.82,"width":500,"height":484}},"如意金箍棒/火焰环4":{"如意金箍棒/火焰环":{"x":56.01,"y":-1.7,"scaleX":0.8252,"scaleY":0.8252,"rotation":84.82,"width":500,"height":484}},"如意金箍棒/火焰环5":{"如意金箍棒/火焰环24":{"path":"如意金箍棒/火焰环23","x":56.01,"y":-1.7,"scaleX":0.8252,"scaleY":0.8252,"rotation":84.82,"width":500,"height":484}},"棍类/金箍棒1":{"金箍棒1":{"type":"mesh","uvs":[0.07084,0,0.03046,0.0372,0,0.25296,0,0.60357,0.03345,0.8382,0.08954,0.83011,0.14788,0.84899,0.22192,0.87596,0.31017,0.90293,0.39842,0.91102,0.51285,0.9272,0.64149,0.95148,0.75966,0.96496,0.85988,0.97305,0.96159,1,1,1,1,0.65481,0.93167,0.67369,0.83968,0.67369,0.7462,0.63593,0.63251,0.58739,0.52183,0.49569,0.40889,0.39051,0.30718,0.27184,0.2107,0.14239,0.12095,0.04799,0.0873,0],"triangles":[23,7,24,7,6,24,24,6,25,25,5,3,25,3,0,5,4,3,1,0,2,6,5,25,25,0,26,0,3,2,14,16,15,13,17,14,14,17,16,12,18,13,13,18,17,11,19,12,12,19,18,11,20,19,9,22,21,9,8,22,7,23,8,8,23,22,10,20,11,10,21,20,10,9,21],"vertices":[1,20,75.56,-43.39,1,1,20,88.99,-36.98,1,1,20,95.52,-13.92,1,1,20,88.8,20.13,1,1,20,72.59,40.61,1,1,20,53.1,35.95,1,2,19,110.82,32.59,0.00588,20,32.31,33.75,0.99412,2,19,84.3,31.03,0.29039,20,5.86,31.26,0.70961,2,19,52.77,28.66,0.96161,20,-25.57,27.78,0.03839,2,18,81.96,23.9,0.01637,19,21.54,24.45,0.98363,3,18,41.26,20.02,0.96305,19,-19.05,19.54,0.03044,10,161,14.91,0.00651,1,10,115.01,14.82,1,1,10,72.82,13.87,1,1,10,37.05,12.73,1,1,10,0.65,13.42,1,1,10,-13.05,12.68,1,1,10,-11.19,-21.45,1,1,10,13.06,-18.26,1,1,10,45.86,-16.48,1,2,18,-37.43,-19.72,0.04976,10,79.38,-18.4,0.95024,1,18,3.43,-19.04,1,2,18,43.81,-22.75,0.91946,19,-15.43,-23.14,0.08054,2,18,85.16,-27.67,0.00888,19,26.03,-27.02,0.99112,2,19,63.75,-32.85,0.75769,20,-12.43,-33.31,0.24231,2,19,99.79,-40.04,0.05773,20,23.84,-39.22,0.94227,1,20,57.09,-42.19,1,1,20,69.79,-44.52,1],"hull":27,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,0,52],"width":357,"height":99}},"棍类/金箍棒2":{"金箍棒2":{"x":190.95,"y":-131.36,"rotation":-160.19,"width":376,"height":408}},"棍类/金箍棒3":{"金箍棒3":{"x":173.98,"y":-92.4,"rotation":-141.83,"width":382,"height":390}},"棍类/金箍棒4":{"金箍棒4":{"x":124.6,"y":-95.73,"rotation":-121.2,"width":392,"height":346}},"AOE光圈扩散1":{"AOE光圈扩散1":{"x":-1.04,"y":-0.61,"rotation":122.17,"width":114,"height":113},"AOE光圈扩散2":{"x":-0.25,"y":0.22,"scaleX":0.2772,"scaleY":0.2772,"rotation":1.88,"width":241,"height":239},"AOE光圈扩散3":{"x":-0.6,"y":-0.68,"scaleX":0.1528,"scaleY":0.1528,"rotation":1.88,"width":403,"height":408},"AOE光圈扩散4":{"x":-1.46,"y":-1.48,"scaleX":0.1023,"scaleY":0.1023,"rotation":1.88,"width":564,"height":576},"AOE光圈扩散5":{"x":-2.31,"y":-1.06,"scaleX":0.0864,"scaleY":0.0864,"rotation":1.88,"width":606,"height":626}},"如意金箍棒/火焰环":{"如意金箍棒/火焰环23":{"x":56.01,"y":-1.7,"scaleX":0.8252,"scaleY":0.8252,"rotation":84.82,"width":500,"height":484}},"击中光":{"击中光1":{"x":-8.21,"y":6.17,"rotation":90.53,"width":235,"height":191},"击中光2":{"x":-7.72,"y":7.17,"rotation":90.53,"width":279,"height":226},"击中光3":{"x":-10.41,"y":5.65,"rotation":90.53,"width":310,"height":258},"击中光4":{"x":-3.73,"y":6.29,"rotation":90.53,"width":345,"height":285},"击中光5":{"x":-6.52,"y":-1.22,"rotation":90.53,"width":347,"height":291},"击中光6":{"x":-4.95,"y":3.74,"rotation":90.53,"width":353,"height":299}},"棍类/棍圆2":{"棍圆":{"x":56.99,"y":-9.38,"rotation":-34.23,"width":343,"height":396},"棍圆21":{"x":56.99,"y":-9.38,"rotation":-34.23,"width":343,"height":396}},"棍类/棍圆":{"棍圆":{"x":56.99,"y":-9.38,"rotation":-34.23,"width":343,"height":396},"棍圆21":{"x":56.99,"y":-9.38,"rotation":-34.23,"width":343,"height":396}},"光效32":{"光效32":{"x":34.33,"y":15.17,"rotation":77.49,"width":500,"height":484}}}}],"animations":{"原地旋转大风车":{"slots":{"如意金箍棒/火焰环2":{"attachment":[{"name":"如意金箍棒/火焰环"}]},"棍类/棍圆":{"attachment":[{"name":"棍圆21"}]},"如意金箍棒/火焰环3":{"attachment":[{"name":"如意金箍棒/火焰环23"}]},"如意金箍棒/火焰环4":{"attachment":[{"name":"如意金箍棒/火焰环"}]},"如意金箍棒/火焰环":{"attachment":[{"name":"如意金箍棒/火焰环23"}]},"棍类/棍圆2":{"attachment":[{"name":"棍圆21"}]}},"bones":{"棍类/菩提灵棍":{"rotate":[{"angle":-23.1},{"time":0.1333,"angle":73.74},{"time":0.2667,"angle":-173.39},{"time":0.3667,"angle":-84.25},{"time":0.5,"angle":10.24},{"time":0.6,"angle":95.69},{"time":0.7333,"angle":-170.96},{"time":0.8667,"angle":-84.25},{"time":0.9667,"angle":10.24},{"time":1.0667,"angle":95.69},{"time":1.2,"angle":-170.96},{"time":1.3,"angle":-84.47},{"time":1.3667,"angle":-23.1}],"scale":[{"x":2.252,"y":1.277}]},"bone5":{"translate":[{"x":-30.16,"y":-33.87}],"scale":[{"x":2.186,"y":2.186}]},"bone":{"rotate":[{"angle":32.52},{"time":0.1333,"angle":127.19},{"time":0.2667,"angle":-102.66},{"time":0.4,"angle":28.75},{"time":0.5333,"angle":163.09},{"time":0.6667,"angle":-104.98},{"time":0.7667,"angle":-25.28},{"time":0.8667,"angle":28.75},{"time":1,"angle":163.09},{"time":1.1333,"angle":-104.98},{"time":1.2333,"angle":-25.28},{"time":1.3667,"angle":32.52}],"translate":[{"x":23.17,"y":24.02}],"scale":[{"x":0.624,"y":0.624}]},"bone3":{"rotate":[{"angle":32.52},{"time":0.1333,"angle":127.19},{"time":0.2667,"angle":-102.66},{"time":0.4,"angle":28.75},{"time":0.5333,"angle":163.09},{"time":0.6667,"angle":-104.98},{"time":0.7667,"angle":-25.28},{"time":0.8667,"angle":28.75},{"time":1,"angle":163.09},{"time":1.1333,"angle":-104.98},{"time":1.2333,"angle":-25.28},{"time":1.3667,"angle":32.52}],"translate":[{"x":23.17,"y":24.02}],"scale":[{"x":-0.624,"y":-0.624}]}}},"待机":{"bones":{"棍类/九齿钉耙":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.5,"angle":2.61,"curve":0.25,"c3":0.75},{"time":1}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.5,"y":-4.8,"curve":0.25,"c3":0.75},{"time":1}]}}},"悟空专属技能效果":{"slots":{"击中光":{"attachment":[{"time":0.8667,"name":"击中光1"},{"time":0.9333,"name":"击中光2"},{"time":1,"name":"击中光3"},{"time":1.0667,"name":"击中光4"},{"time":1.1333,"name":"击中光5"},{"time":1.2,"name":"击中光6"},{"time":1.2667,"name":null}]},"棍类/如意金箍棒":{"attachment":[{"time":0.8667,"name":null}]},"棍类/金箍棒2":{"color":[{"time":1,"color":"ffffffff"},{"time":1.1333,"color":"ffffff00"}],"attachment":[{"time":0.8667,"name":"金箍棒2"}]},"棍类/金箍棒1":{"attachment":[{"time":0.8667,"name":"金箍棒1"},{"time":1.1667,"name":null}]},"棍类/金箍棒3":{"color":[{"time":0.9333,"color":"ffffffff"},{"time":1.0333,"color":"ffffff00"}],"attachment":[{"time":0.8667,"name":"金箍棒3"}]},"棍类/棍圆2":{"color":[{"time":0.8667,"color":"ffffffa9"},{"time":1.1667,"color":"ffffff9e"},{"time":1.3,"color":"ffffff00"}]},"棍类/金箍棒4":{"color":[{"time":0.9,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"time":0.8667,"name":"金箍棒4"}]}},"bones":{"棍类/九齿钉耙":{"rotate":[{"curve":0.284,"c3":0.625,"c4":0.38},{"time":0.3333,"angle":-69.59,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.64},{"time":0.8333,"angle":-85.43,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.64},{"time":1.1667,"angle":57.71,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.5,"angle":-43.63,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":2.0667}],"translate":[{},{"time":0.3333,"x":5.49,"y":63.89},{"time":0.8333,"x":9.36,"y":67.13},{"time":1.1667,"x":-39.59,"y":3.5},{"time":1.5,"x":5.49,"y":63.89},{"time":2.0667,"curve":"stepped"},{"time":2.3333}],"scale":[{},{"time":0.3333,"x":1.438,"y":1.438},{"time":0.8333,"x":1.551,"y":1.551},{"time":1.1667,"x":1.653,"y":1.653},{"time":1.5,"x":1.438,"y":1.438},{"time":1.7333}]},"bone3":{"rotate":[{"time":0.8667},{"time":0.9667,"angle":123.16},{"time":1.0333,"angle":-80.32},{"time":1.1333,"angle":19.88},{"time":1.3,"angle":75.83}],"translate":[{"time":0.8667,"x":37.35,"y":20.42}],"scale":[{"time":0.8667,"x":1.6,"y":1.6}]},"棍类/金箍棒1":{"rotate":[{"time":0.8667},{"time":0.9667,"angle":2.53}],"translate":[{"time":0.8667,"curve":"stepped"},{"time":0.9333,"x":-1.35,"y":2.62,"curve":"stepped"},{"time":1}]},"棍类/金箍棒2":{"rotate":[{"time":0.8667},{"time":0.9667,"angle":7.66},{"time":1.0667,"angle":21.08}],"translate":[{"time":0.8667,"x":-10.76,"y":3.31},{"time":0.9667,"x":-3.31,"y":3.31}]},"棍类/金箍棒3":{"rotate":[{"time":0.8667},{"time":0.9667,"angle":16.44}],"translate":[{"time":0.8667,"x":0.83}]},"棍类/金箍棒4":{"rotate":[{"time":0.8667},{"time":0.9667,"angle":25.78}]},"bone4":{"rotate":[{"time":0.8667,"angle":6.33}],"translate":[{"time":0.8667,"x":5.65,"y":-0.87}],"scale":[{"time":0.8667,"x":0.952,"y":0.952}]},"击中光":{"translate":[{"time":0.8667,"x":6.24,"y":-24.96}],"scale":[{"time":0.8667,"x":1.189,"y":1.189},{"time":1.2667,"x":1.655,"y":1.655}]},"棍类/九齿钉耙3":{"rotate":[{"time":1.0333,"angle":-1.22},{"time":1.1,"angle":0.42},{"time":1.1667,"angle":0.71},{"time":1.2333,"angle":-0.79}],"scale":[{"time":0.9},{"time":1,"y":1.33},{"time":1.1667,"y":1.18},{"time":1.2333}]},"棍类/九齿钉耙4":{"rotate":[{"time":1.0333,"angle":-1.22},{"time":1.1,"angle":0.42},{"time":1.1667,"angle":0.71},{"time":1.2333,"angle":-0.79}],"scale":[{"time":0.9},{"time":1,"y":1.322},{"time":1.1667,"y":1.174},{"time":1.2333}]},"棍类/九齿钉耙5":{"rotate":[{"time":1.0333,"angle":-1.22},{"time":1.1,"angle":0.42},{"time":1.1667,"angle":0.72},{"time":1.2333,"angle":-0.79}],"scale":[{"time":0.9},{"time":1,"y":1.26},{"time":1.1667,"y":1.142},{"time":1.2333}]},"棍类/九齿钉耙2":{"rotate":[{"time":1.0333,"angle":-1.22},{"time":1.1,"angle":0.42},{"time":1.1667,"angle":0.71},{"time":1.2333,"angle":-0.79}],"scale":[{"time":1,"y":1.109}]},"棍类/金箍棒5":{"rotate":[{"time":0.8667},{"time":0.9333,"angle":3.5},{"time":1,"angle":1.46}]},"棍类/金箍棒6":{"rotate":[{"time":0.8667},{"time":0.9333,"angle":3.5},{"time":1,"angle":1.46}]},"棍类/金箍棒7":{"rotate":[{"time":0.8667},{"time":0.9333,"angle":3.5},{"time":1,"angle":1.46}]}}},"攻击1":{"slots":{"棍类/棍圆":{"color":[{"time":0.3667,"color":"ffffffa9"},{"time":0.6667,"color":"ffffff9e"},{"time":0.8,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"棍圆"}]},"棍类/棍圆2":{"color":[{"time":0.3667,"color":"ffffffa9"},{"time":0.6667,"color":"ffffff9e"},{"time":0.8,"color":"ffffff00"}]},"如意金箍棒/火焰环5":{"color":[{"time":0.7333,"color":"fdf5f5ff"},{"time":0.9667,"color":"fdf5f500"}],"attachment":[{"time":0.3667,"name":"如意金箍棒/火焰环24"}]}},"bones":{"棍类/九齿钉耙":{"rotate":[{"curve":0.284,"c3":0.625,"c4":0.38},{"time":0.2667,"angle":-42.57,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":0.3333,"angle":-43.63,"curve":"stepped"},{"time":1,"angle":-43.63,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.3333}],"translate":[{"curve":0.284,"c3":0.625,"c4":0.38},{"time":0.2333,"x":0.45,"y":43.84,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":0.2667,"x":5.5,"y":63.43,"curve":0.346,"c2":0.38,"c3":0.757},{"time":0.3333,"x":5.49,"y":63.89,"curve":"stepped"},{"time":1,"x":5.49,"y":63.89,"curve":0.346,"c2":0.38,"c3":0.757},{"time":1.3333}]},"bone2":{"rotate":[{"time":0.3333},{"time":0.4,"angle":90.76},{"time":0.4667,"angle":178.85},{"time":0.5333,"angle":-89.41},{"time":0.6333,"angle":22.4},{"time":0.7,"angle":59.23},{"time":1.3333}]},"bone":{"rotate":[{"time":0.3667,"angle":21.4},{"time":0.4333,"angle":116.33},{"time":0.5333,"angle":-103.55},{"time":0.6667,"angle":19.88},{"time":0.8,"angle":24.49}],"translate":[{"time":0.3667,"x":37.35,"y":20.42},{"time":0.4333,"x":6.21,"y":20.42},{"time":0.5333,"x":45.13,"y":20.42},{"time":0.6667,"x":28.65,"y":27.11}],"scale":[{"time":0.3667,"x":1.6,"y":1.6}]},"bone3":{"rotate":[{"time":0.3667},{"time":0.4667,"angle":123.16},{"time":0.5333,"angle":-80.32},{"time":0.6333,"angle":19.88},{"time":0.8,"angle":75.83}],"translate":[{"time":0.3667,"x":37.35,"y":20.42}],"scale":[{"time":0.3667,"x":1.6,"y":1.6}]},"棍类/菩提灵棍":{"scale":[{},{"time":0.3333,"x":2.252,"y":1.277,"curve":"stepped"},{"time":1,"x":2.252,"y":1.277},{"time":1.3333,"curve":"stepped"},{"time":1.5}]}}},"攻击2":{"slots":{"棍类/棍圆":{"color":[{"time":0.3667,"color":"ffffffa9"},{"time":0.6667,"color":"ffffff9e"},{"time":0.8,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"棍圆"}]},"棍类/棍圆2":{"color":[{"time":0.3667,"color":"ffffffa9"},{"time":0.6667,"color":"ffffff9e"},{"time":0.8,"color":"ffffff00"}]},"如意金箍棒/火焰环5":{"color":[{"time":1.0333,"color":"fdf5f5ff"},{"time":1.2667,"color":"fdf5f500"}],"attachment":[{"time":0.3667,"name":"如意金箍棒/火焰环24"}]}},"bones":{"棍类/九齿钉耙":{"rotate":[{"curve":0.284,"c3":0.625,"c4":0.38},{"time":0.2667,"angle":-42.57,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":0.3333,"angle":-43.63,"curve":"stepped"},{"time":1,"angle":-43.63,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.3333}],"translate":[{"curve":0.284,"c3":0.625,"c4":0.38},{"time":0.2333,"x":0.45,"y":43.84,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":0.2667,"x":5.5,"y":63.43,"curve":0.346,"c2":0.38,"c3":0.757},{"time":0.3333,"x":5.49,"y":63.89,"curve":"stepped"},{"time":1,"x":5.49,"y":63.89,"curve":0.346,"c2":0.38,"c3":0.757},{"time":1.3333}]},"bone2":{"rotate":[{"time":0.3333},{"time":0.4,"angle":90.76},{"time":0.4667,"angle":178.85},{"time":0.5333,"angle":-89.41},{"time":0.6333,"angle":22.4},{"time":0.7,"angle":59.23},{"time":0.7667,"angle":90.76},{"time":0.8333,"angle":178.85},{"time":0.9,"angle":-89.41},{"time":1,"angle":22.4},{"time":1.0667,"angle":59.23},{"time":1.3333}]},"bone":{"rotate":[{"time":0.3667,"angle":21.4},{"time":0.4333,"angle":116.33},{"time":0.5333,"angle":-103.55},{"time":0.7,"angle":21.4},{"time":0.7667,"angle":116.33},{"time":0.8667,"angle":-103.55},{"time":0.9667,"angle":19.88},{"time":1.1333,"angle":24.49}],"translate":[{"time":0.3667,"x":37.35,"y":20.42},{"time":0.4333,"x":6.21,"y":20.42},{"time":0.5333,"x":45.13,"y":20.42},{"time":0.6667,"x":28.65,"y":27.11}],"scale":[{"time":0.3667,"x":1.6,"y":1.6}]},"bone3":{"rotate":[{"time":0.3667},{"time":0.4667,"angle":123.16},{"time":0.5333,"angle":-80.32},{"time":0.6333,"angle":19.88},{"time":0.8,"angle":75.83}],"translate":[{"time":0.3667,"x":37.35,"y":20.42}],"scale":[{"time":0.3667,"x":1.6,"y":1.6}]},"棍类/菩提灵棍":{"scale":[{},{"time":0.3333,"x":2.252,"y":1.277,"curve":"stepped"},{"time":1.1,"x":2.252,"y":1.277},{"time":1.4,"curve":"stepped"},{"time":1.5}]}}},"攻击3":{"slots":{"棍类/棍圆":{"color":[{"time":0.3667,"color":"ffffffa9"},{"time":0.6667,"color":"ffffff9e"},{"time":0.8,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"棍圆"}]},"棍类/棍圆2":{"color":[{"time":0.3667,"color":"ffffffa9"},{"time":0.6667,"color":"ffffff9e"},{"time":0.8,"color":"ffffff00"}]},"光效32":{"color":[{"time":1,"color":"ffffffff"},{"time":1.4333,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"光效32"}]},"如意金箍棒/火焰环5":{"color":[{"time":1.0333,"color":"fdf5f5ff"},{"time":1.2667,"color":"fdf5f500"}]}},"bones":{"棍类/九齿钉耙":{"rotate":[{"curve":0.284,"c3":0.625,"c4":0.38},{"time":0.2667,"angle":-42.57,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":0.3333,"angle":-43.63,"curve":"stepped"},{"time":1,"angle":-43.63,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.3333}],"translate":[{"curve":0.284,"c3":0.625,"c4":0.38},{"time":0.2333,"x":0.45,"y":43.84,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":0.2667,"x":5.5,"y":63.43,"curve":0.346,"c2":0.38,"c3":0.757},{"time":0.3333,"x":5.49,"y":63.89,"curve":"stepped"},{"time":1,"x":5.49,"y":63.89,"curve":0.346,"c2":0.38,"c3":0.757},{"time":1.3333}]},"bone2":{"rotate":[{"time":0.3333},{"time":0.4,"angle":90.76},{"time":0.4667,"angle":178.85},{"time":0.5333,"angle":-89.41},{"time":0.6333,"angle":22.4},{"time":0.7,"angle":59.23},{"time":0.7667,"angle":90.76},{"time":0.8333,"angle":178.85},{"time":0.9,"angle":-89.41},{"time":1,"angle":22.4},{"time":1.0667,"angle":59.23},{"time":1.3333}]},"bone":{"rotate":[{"time":0.3667,"angle":21.4},{"time":0.4333,"angle":116.33},{"time":0.5333,"angle":-103.55},{"time":0.7,"angle":21.4},{"time":0.7667,"angle":116.33},{"time":0.8667,"angle":-103.55},{"time":0.9667,"angle":3.24},{"time":1.1333,"angle":24.49}],"translate":[{"time":0.3667,"x":37.35,"y":20.42},{"time":0.4333,"x":6.21,"y":20.42},{"time":0.5333,"x":45.13,"y":20.42},{"time":0.6667,"x":28.65,"y":27.11}],"scale":[{"time":0.3667,"x":1.6,"y":1.6}]},"bone3":{"rotate":[{"time":0.3667},{"time":0.4667,"angle":123.16},{"time":0.5333,"angle":-80.32},{"time":0.6333,"angle":19.88},{"time":0.8,"angle":75.83}],"translate":[{"time":0.3667,"x":37.35,"y":20.42}],"scale":[{"time":0.3667,"x":1.6,"y":1.6}]},"棍类/菩提灵棍":{"scale":[{},{"time":0.3333,"x":2.252,"y":1.277,"curve":"stepped"},{"time":1.1,"x":2.252,"y":1.277},{"time":1.4,"curve":"stepped"},{"time":1.5}]}}}}}
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json.meta b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json.meta
new file mode 100644
index 0000000..23fd2a3
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "35c3ad81-2132-4358-8e17-a1063d1b12d7",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "2499632f-2735-42d7-a814-72d005443c28"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png
new file mode 100644
index 0000000..b04a2e1
Binary files /dev/null and b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png differ
diff --git a/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png.meta b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png.meta
new file mode 100644
index 0000000..bd9c249
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "06c2a664-77b6-45bb-a3f9-599c4e02dc56",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@6c48a",
+      "displayName": "棍类武器+专属技能",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "06c2a664-77b6-45bb-a3f9-599c4e02dc56",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@f9941",
+      "displayName": "棍类武器+专属技能",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1774,
+        "height": 1292,
+        "rawWidth": 1774,
+        "rawHeight": 1292,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -887,
+            -646,
+            0,
+            887,
+            -646,
+            0,
+            -887,
+            646,
+            0,
+            887,
+            646,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1292,
+            1774,
+            1292,
+            0,
+            0,
+            1774,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -887,
+            -646,
+            0
+          ],
+          "maxPos": [
+            887,
+            646,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@6c48a"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖.meta b/assets/res/battleGameWeapon/spine/武器/法杖.meta
new file mode 100644
index 0000000..8fb3f96
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "4ca90a83-642c-4619-ae0c-591056b4db90",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/.WeDrive b/assets/res/battleGameWeapon/spine/武器/法杖/.WeDrive
new file mode 100644
index 0000000..92f10cd
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖/.WeDrive
@@ -0,0 +1 @@
+D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\法杖
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas
new file mode 100644
index 0000000..41e5a4e
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas
@@ -0,0 +1,167 @@
+
+法杖武器+专属技能.png
+size: 1881,950
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+AOE光圈扩散1
+  rotate: false
+  xy: 144, 0
+  size: 102, 102
+  orig: 114, 113
+  offset: 6, 5
+  index: -1
+AOE光圈扩散2
+  rotate: false
+  xy: 1499, 335
+  size: 227, 226
+  orig: 241, 239
+  offset: 7, 6
+  index: -1
+AOE光圈扩散3
+  rotate: false
+  xy: 1126, 564
+  size: 380, 386
+  orig: 403, 408
+  offset: 10, 12
+  index: -1
+AOE光圈扩散4
+  rotate: false
+  xy: 582, 404
+  size: 542, 546
+  orig: 564, 576
+  offset: 12, 15
+  index: -1
+AOE光圈扩散5
+  rotate: false
+  xy: 0, 359
+  size: 580, 591
+  orig: 606, 626
+  offset: 10, 14
+  index: -1
+光点1
+  rotate: true
+  xy: 0, 41
+  size: 316, 142
+  orig: 336, 149
+  offset: 0, 4
+  index: -1
+光点2
+  rotate: false
+  xy: 248, 3
+  size: 368, 99
+  orig: 370, 103
+  offset: 2, 2
+  index: -1
+光点3
+  rotate: false
+  xy: 1261, 22
+  size: 186, 147
+  orig: 212, 166
+  offset: 9, 0
+  index: -1
+光点4
+  rotate: true
+  xy: 144, 104
+  size: 253, 190
+  orig: 293, 225
+  offset: 26, 20
+  index: -1
+刀光1
+  rotate: true
+  xy: 336, 115
+  size: 242, 241
+  orig: 251, 250
+  offset: 5, 4
+  index: -1
+刀光2
+  rotate: false
+  xy: 579, 118
+  size: 230, 239
+  orig: 239, 249
+  offset: 6, 4
+  index: -1
+刀光3
+  rotate: true
+  xy: 1508, 563
+  size: 223, 237
+  orig: 232, 248
+  offset: 7, 4
+  index: -1
+刀光4
+  rotate: true
+  xy: 1261, 171
+  size: 201, 227
+  orig: 218, 242
+  offset: 8, 5
+  index: -1
+刀光5
+  rotate: true
+  xy: 1295, 374
+  size: 188, 202
+  orig: 202, 212
+  offset: 8, 0
+  index: -1
+刀光6
+  rotate: false
+  xy: 1490, 10
+  size: 173, 202
+  orig: 191, 208
+  offset: 8, 6
+  index: -1
+挥砍1
+  rotate: false
+  xy: 1126, 409
+  size: 167, 153
+  orig: 177, 164
+  offset: 6, 5
+  index: -1
+挥砍2
+  rotate: true
+  xy: 1728, 368
+  size: 161, 153
+  orig: 173, 164
+  offset: 7, 5
+  index: -1
+挥砍3
+  rotate: true
+  xy: 1728, 214
+  size: 152, 153
+  orig: 167, 164
+  offset: 8, 4
+  index: -1
+挥砍4
+  rotate: false
+  xy: 1665, 66
+  size: 138, 146
+  orig: 160, 161
+  offset: 9, 6
+  index: -1
+挥砍5
+  rotate: true
+  xy: 1747, 657
+  size: 129, 132
+  orig: 151, 144
+  offset: 10, 1
+  index: -1
+挥砍6
+  rotate: true
+  xy: 1747, 531
+  size: 124, 130
+  orig: 144, 141
+  offset: 10, 6
+  index: -1
+法杖
+  rotate: true
+  xy: 1508, 788
+  size: 162, 371
+  orig: 162, 371
+  offset: 0, 0
+  index: -1
+聚集光能
+  rotate: true
+  xy: 811, 12
+  size: 390, 448
+  orig: 406, 464
+  offset: 8, 8
+  index: -1
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas.meta b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas.meta
new file mode 100644
index 0000000..69a0bef
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas.meta
@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "e02a71b2-6c29-4b70-b3bb-9d75249cf1ad",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json
new file mode 100644
index 0000000..2e4cd74
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"A2XE6jLE8wJmg6vcZgSIcLDEBi4","spine":"3.8.75","x":-17.87,"y":-33.19,"width":36.45,"height":83.48,"images":"./images/法杖/","audio":"C:/Users/EDY/Desktop/"},"bones":[{"name":"root"},{"name":"bone","parent":"root","x":-0.33,"y":-2.58,"scaleX":0.225,"scaleY":0.225},{"name":"剑类/大宝剑","parent":"bone","length":42.21,"rotation":116.57,"x":18.98,"y":14.3},{"name":"挥砍","parent":"bone","length":48.43,"rotation":131.41,"x":-77.97,"y":65.21},{"name":"AOE光圈扩散","parent":"root","length":42.37,"x":-377.49,"y":271.58},{"name":"聚集光能","parent":"bone","length":72.72,"rotation":-1.62,"x":1.83,"y":141.62},{"name":"光点3","parent":"root","length":69.02,"rotation":13.23,"x":89.88,"y":55.27,"scaleX":0.3471,"scaleY":0.3471},{"name":"光点1","parent":"root","length":89.2,"rotation":-166.71,"x":-74.59,"y":20.27,"scaleX":0.2441,"scaleY":0.2441},{"name":"光点4","parent":"root","length":90.66,"rotation":35.15,"x":56.66,"y":74.59,"scaleX":0.2441,"scaleY":0.2441},{"name":"光点2","parent":"root","length":109.3,"rotation":149.6,"x":-62.37,"y":68.5,"scaleX":0.2441,"scaleY":0.2441}],"slots":[{"name":"AOE光圈扩散","bone":"AOE光圈扩散"},{"name":"挥砍","bone":"挥砍"},{"name":"挥砍2","bone":"挥砍"},{"name":"剑类/大宝剑","bone":"剑类/大宝剑","attachment":"法杖"},{"name":"聚集光能","bone":"聚集光能"},{"name":"光点1","bone":"光点1"},{"name":"光点6","bone":"光点1","color":"ffffff41","blend":"additive"},{"name":"光点2","bone":"光点2"},{"name":"光点5","bone":"光点2","color":"ffffff41","blend":"additive"},{"name":"光点3","bone":"光点3"},{"name":"光点7","bone":"光点3","color":"ffffff41","blend":"additive"},{"name":"光点4","bone":"光点4"},{"name":"光点8","bone":"光点4","color":"ffffff41","blend":"additive"}],"skins":[{"name":"default","attachments":{"聚集光能":{"聚集光能":{"x":1.8,"y":-2.13,"rotation":1.62,"width":406,"height":464}},"挥砍":{"挥砍1":{"x":16.13,"y":-6.25,"rotation":-131.41,"width":177,"height":164},"挥砍2":{"x":17.45,"y":-4.75,"rotation":-131.41,"width":173,"height":164},"挥砍3":{"x":18.11,"y":-4,"rotation":-131.41,"width":167,"height":164},"挥砍4":{"x":20.62,"y":1.12,"rotation":-131.41,"width":160,"height":161},"挥砍5":{"x":27.64,"y":2.27,"rotation":-131.41,"width":151,"height":144},"挥砍6":{"x":25.16,"y":7.78,"rotation":-131.41,"width":144,"height":141}},"AOE光圈扩散":{"AOE光圈扩散1":{"x":0.49,"y":-0.08,"width":114,"height":113},"AOE光圈扩散2":{"x":0.87,"y":-0.63,"scaleX":0.2785,"scaleY":0.2785,"width":241,"height":239},"AOE光圈扩散3":{"x":1.26,"y":-0.63,"scaleX":0.1474,"scaleY":0.1474,"width":403,"height":408},"AOE光圈扩散4":{"x":0.49,"y":-0.19,"scaleX":0.0941,"scaleY":0.0941,"width":564,"height":576},"AOE光圈扩散5":{"x":0.71,"y":-0.56,"scaleX":0.0841,"scaleY":0.0841,"width":606,"height":626}},"光点1":{"光点1":{"x":124.58,"y":8.38,"rotation":20.56,"width":336,"height":149}},"光点2":{"光点2":{"x":142.11,"y":3.13,"rotation":1.28,"width":370,"height":103}},"光点3":{"光点3":{"x":65.11,"y":-0.22,"rotation":-34.73,"width":212,"height":166}},"光点4":{"光点4":{"x":74.94,"y":5.09,"rotation":-35.15,"width":293,"height":225}},"光点5":{"光点2":{"x":142.11,"y":3.13,"rotation":1.28,"width":370,"height":103}},"光点6":{"光点1":{"x":124.58,"y":8.38,"rotation":20.56,"width":336,"height":149}},"光点7":{"光点3":{"x":65.11,"y":-0.22,"rotation":-34.73,"width":212,"height":166}},"光点8":{"光点4":{"x":74.94,"y":5.09,"rotation":-35.15,"width":293,"height":225}},"挥砍2":{"刀光1":{"x":16.13,"y":-6.25,"rotation":-131.41,"width":251,"height":250},"刀光2":{"x":17.45,"y":-4.75,"rotation":-131.41,"width":239,"height":249},"刀光3":{"x":18.11,"y":-4,"rotation":-131.41,"width":232,"height":248},"刀光4":{"x":20.62,"y":1.12,"rotation":-131.41,"width":218,"height":242},"刀光5":{"x":27.64,"y":2.27,"rotation":-131.41,"width":202,"height":212},"刀光6":{"x":25.16,"y":7.78,"rotation":-131.41,"width":191,"height":208}},"剑类/大宝剑":{"法杖":{"x":38.55,"y":-1.46,"rotation":-116.57,"width":162,"height":371}}}}],"animations":{"待机":{"bones":{"bone":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.5,"angle":2.35,"curve":0.25,"c3":0.75},{"time":1}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.5,"x":-0.29,"y":-3.72,"curve":0.25,"c3":0.75},{"time":1}]}}},"暴风雪技能":{"slots":{"AOE光圈扩散":{"attachment":[{"time":0.1333,"name":"AOE光圈扩散1"},{"time":0.2333,"name":"AOE光圈扩散2"},{"time":0.3333,"name":"AOE光圈扩散3"},{"time":0.4333,"name":"AOE光圈扩散4"},{"time":0.5333,"name":"AOE光圈扩散5"},{"time":0.6333,"name":null}]}},"bones":{"bone":{"scale":[{},{"time":0.3333,"x":1.207,"y":1.207,"curve":"stepped"},{"time":0.9333,"x":1.207,"y":1.207},{"time":1.3333}]},"剑类/大宝剑":{"rotate":[{},{"time":0.2333,"angle":-7.44},{"time":0.4333,"angle":-18.35},{"time":0.6333,"angle":-7.44},{"time":0.8333,"angle":-18.35},{"time":1.0333,"angle":-7.44},{"time":1.5}],"translate":[{},{"time":0.2333,"x":-1.14,"y":51.53,"curve":"stepped"},{"time":1.0333,"x":-1.14,"y":51.53},{"time":1.5}]},"AOE光圈扩散":{"translate":[{"x":380.43,"y":-227.86}],"scale":[{"time":0.1333},{"time":0.2,"x":1.95,"y":1.95},{"time":0.2333,"x":3.504,"y":3.504},{"time":0.3,"x":4.274,"y":4.274},{"time":0.3333,"x":6.153,"y":6.153},{"time":0.4,"x":6.591,"y":6.591},{"time":0.4333,"x":8.009,"y":8.009},{"time":0.5,"x":8.047,"y":8.047},{"time":0.5333,"x":10.331,"y":10.331}]}}},"水弹攻击1":{"slots":{"光点2":{"attachment":[{"time":0.4333,"name":"光点2"},{"time":0.6,"name":null}]},"光点3":{"attachment":[{"time":0.4333,"name":"光点3"},{"time":0.5667,"name":null},{"time":0.6667,"name":"光点3"},{"time":0.8333,"name":null}]},"光点1":{"attachment":[{"time":0.3667,"name":"光点1"},{"time":0.5333,"name":null},{"time":0.6667,"name":"光点1"},{"time":0.8333,"name":null}]},"聚集光能":{"color":[{"time":0.1,"color":"ffffff00"},{"time":0.5,"color":"ffffffe2"}],"attachment":[{"time":0.1667,"name":"聚集光能"},{"time":1.0333,"name":null}]},"光点4":{"attachment":[{"time":0.2333,"name":"光点4"},{"time":0.3667,"name":null},{"time":0.5667,"name":"光点4"},{"time":0.7333,"name":null}]},"光点7":{"attachment":[{"time":0.4333,"name":"光点3"},{"time":0.5667,"name":null},{"time":0.6667,"name":"光点3"},{"time":0.8333,"name":null}]},"光点5":{"color":[{"time":0.4333,"color":"ffffff00"},{"time":0.5667,"color":"ffffff41"}],"attachment":[{"time":0.4333,"name":"光点2"},{"time":0.6,"name":null}]},"光点6":{"color":[{"time":0.3667,"color":"ffffff00"},{"time":0.5,"color":"ffffff21","curve":"stepped"},{"time":0.6667,"color":"ffffff00"},{"time":0.8,"color":"ffffff21"}],"attachment":[{"time":0.3667,"name":"光点1"},{"time":0.5333,"name":null},{"time":0.6667,"name":"光点1"},{"time":0.8333,"name":null}]},"光点8":{"attachment":[{"time":0.2333,"name":"光点4"},{"time":0.3667,"name":null},{"time":0.5667,"name":"光点4"},{"time":0.7333,"name":null}]}},"bones":{"bone":{"scale":[{},{"time":0.6333,"x":1.207,"y":1.207,"curve":"stepped"},{"time":1.0667,"x":1.207,"y":1.207},{"time":1.3667}]},"剑类/大宝剑":{"rotate":[{},{"time":0.2667,"angle":-16.18},{"time":0.8667,"angle":-33.19},{"time":1.4}],"translate":[{},{"time":0.2667,"x":16.32,"y":43.94},{"time":0.8667,"x":18.14,"y":48.82},{"time":1.4,"curve":"stepped"},{"time":1.5}]},"挥砍":{"rotate":[{"time":0.6333,"angle":-12.98},{"time":0.7,"angle":23.06}],"translate":[{"time":0.6333,"x":110.67,"y":7.9},{"time":0.7,"x":64.63,"y":-33.94}],"scale":[{"time":0.6333,"x":1.281,"y":1.281},{"time":0.7333,"x":1.444,"y":1.444}]},"聚集光能":{"rotate":[{"time":0.1667},{"time":1.0333,"angle":169.31}],"translate":[{"time":0.1667,"x":32.33,"y":34.95},{"time":0.5333,"x":65.48,"y":44.75},{"time":0.8667,"x":86.55,"y":37.38},{"time":1.0333,"x":61.27,"y":30.01}],"scale":[{},{"time":0.5333,"x":1.231,"y":1.231},{"time":1.0333,"x":0.484,"y":0.484}]},"光点2":{"translate":[{"time":0.4333,"x":-35.29,"y":37.02},{"time":0.6,"x":78.54,"y":-26.3}]},"光点4":{"rotate":[{"time":0.5667,"angle":27.63}],"translate":[{"time":0.2333,"x":56.05,"y":40.48},{"time":0.3667,"x":-32.87,"y":-25.95,"curve":"stepped"},{"time":0.5667,"x":6.35,"y":54.43},{"time":0.7333,"x":-32.87,"y":-25.95}]},"光点1":{"rotate":[{"time":0.3667,"angle":0.07,"curve":"stepped"},{"time":0.6667,"angle":137.83}],"translate":[{"time":0.3667,"x":-0.69,"y":-9},{"time":0.5333,"x":95.95,"y":24.36,"curve":"stepped"},{"time":0.6667,"x":181.12,"y":-11.18},{"time":0.8333,"x":95.95,"y":24.36}]},"光点3":{"rotate":[{"time":0.4333,"angle":-66.53,"curve":"stepped"},{"time":0.6667,"angle":168.79}],"translate":[{"time":0.4333,"x":-18.95,"y":-90.2},{"time":0.5667,"x":-71.25,"y":-12.13,"curve":"stepped"},{"time":0.6667,"x":-171.99,"y":-5.62},{"time":0.8333,"x":-71.25,"y":-12.13}]}}}}}
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json.meta b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json.meta
new file mode 100644
index 0000000..6b289bd
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "c9a6d736-aeee-4865-a852-c4998d8827d1",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "e02a71b2-6c29-4b70-b3bb-9d75249cf1ad"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png
new file mode 100644
index 0000000..f2256a9
Binary files /dev/null and b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png differ
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png.meta b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png.meta
new file mode 100644
index 0000000..597abd9
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@6c48a",
+      "displayName": "法杖武器+专属技能",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@f9941",
+      "displayName": "法杖武器+专属技能",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1881,
+        "height": 950,
+        "rawWidth": 1881,
+        "rawHeight": 950,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -940.5,
+            -475,
+            0,
+            940.5,
+            -475,
+            0,
+            -940.5,
+            475,
+            0,
+            940.5,
+            475,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            950,
+            1881,
+            950,
+            0,
+            0,
+            1881,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -940.5,
+            -475,
+            0
+          ],
+          "maxPos": [
+            940.5,
+            475,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@6c48a"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png b/assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png
new file mode 100644
index 0000000..852d380
Binary files /dev/null and b/assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png differ
diff --git a/assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png.meta b/assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png.meta
new file mode 100644
index 0000000..7291e29
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "d0abd767-3ed4-49ca-b7dd-e295c41cd319",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@6c48a",
+      "displayName": "飞行水弹",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "d0abd767-3ed4-49ca-b7dd-e295c41cd319",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@f9941",
+      "displayName": "飞行水弹",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 322,
+        "height": 122,
+        "rawWidth": 322,
+        "rawHeight": 122,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -161,
+            -61,
+            0,
+            161,
+            -61,
+            0,
+            -161,
+            61,
+            0,
+            161,
+            61,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            122,
+            322,
+            122,
+            0,
+            0,
+            322,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -161,
+            -61,
+            0
+          ],
+          "maxPos": [
+            161,
+            61,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@6c48a"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪.meta b/assets/res/battleGameWeapon/spine/武器/长枪.meta
new file mode 100644
index 0000000..5400372
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/长枪.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "957c5a83-cb59-4f98-8d71-0851929ffdc5",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪/.WeDrive b/assets/res/battleGameWeapon/spine/武器/长枪/.WeDrive
new file mode 100644
index 0000000..be711df
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/长枪/.WeDrive
@@ -0,0 +1 @@
+D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\长枪
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas
new file mode 100644
index 0000000..85de604
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas
@@ -0,0 +1,167 @@
+
+枪类武器+专属技能.png
+size: 1058,543
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+枪类/a11
+  rotate: false
+  xy: 821, 297
+  size: 226, 43
+  orig: 226, 47
+  offset: 0, 2
+  index: -1
+枪类/刀光1
+  rotate: true
+  xy: 121, 301
+  size: 242, 241
+  orig: 251, 250
+  offset: 5, 4
+  index: -1
+枪类/刀光2
+  rotate: false
+  xy: 364, 304
+  size: 230, 239
+  orig: 239, 249
+  offset: 6, 4
+  index: -1
+枪类/刀光3
+  rotate: false
+  xy: 596, 306
+  size: 223, 237
+  orig: 232, 248
+  offset: 7, 4
+  index: -1
+枪类/刀光4
+  rotate: true
+  xy: 821, 342
+  size: 201, 227
+  orig: 218, 242
+  offset: 8, 5
+  index: -1
+枪类/刀光5
+  rotate: false
+  xy: 698, 17
+  size: 188, 202
+  orig: 202, 212
+  offset: 8, 0
+  index: -1
+枪类/刀光6
+  rotate: true
+  xy: 121, 126
+  size: 173, 202
+  orig: 191, 208
+  offset: 8, 6
+  index: -1
+枪类/技能落地受击1
+  rotate: false
+  xy: 796, 250
+  size: 79, 45
+  orig: 89, 53
+  offset: 5, 3
+  index: -1
+枪类/技能落地受击2
+  rotate: true
+  xy: 69, 12
+  size: 100, 55
+  orig: 113, 78
+  offset: 6, 3
+  index: -1
+枪类/技能落地受击3
+  rotate: true
+  xy: 0, 1
+  size: 111, 67
+  orig: 120, 76
+  offset: 3, 4
+  index: -1
+枪类/技能落地受击4
+  rotate: true
+  xy: 258, 6
+  size: 118, 61
+  orig: 128, 71
+  offset: 1, 5
+  index: -1
+枪类/挥砍1
+  rotate: true
+  xy: 325, 132
+  size: 167, 153
+  orig: 177, 164
+  offset: 6, 5
+  index: -1
+枪类/挥砍2
+  rotate: true
+  xy: 543, 141
+  size: 161, 153
+  orig: 173, 164
+  offset: 7, 5
+  index: -1
+枪类/挥砍3
+  rotate: true
+  xy: 888, 143
+  size: 152, 153
+  orig: 167, 164
+  offset: 8, 4
+  index: -1
+枪类/挥砍4
+  rotate: true
+  xy: 548, 1
+  size: 138, 146
+  orig: 160, 161
+  offset: 9, 6
+  index: -1
+枪类/挥砍5
+  rotate: true
+  xy: 414, 1
+  size: 129, 132
+  orig: 151, 144
+  offset: 10, 1
+  index: -1
+枪类/挥砍6
+  rotate: true
+  xy: 126, 0
+  size: 124, 130
+  orig: 144, 141
+  offset: 10, 6
+  index: -1
+枪类/枪
+  rotate: false
+  xy: 0, 114
+  size: 119, 429
+  orig: 119, 429
+  offset: 0, 0
+  index: -1
+枪类/枪受击1
+  rotate: false
+  xy: 975, 50
+  size: 83, 91
+  orig: 86, 94
+  offset: 2, 3
+  index: -1
+枪类/枪受击2
+  rotate: false
+  xy: 888, 48
+  size: 85, 93
+  orig: 85, 94
+  offset: 0, 0
+  index: -1
+枪类/枪受击3
+  rotate: true
+  xy: 698, 221
+  size: 83, 96
+  orig: 83, 96
+  offset: 0, 0
+  index: -1
+枪类/枪受击4
+  rotate: false
+  xy: 321, 28
+  size: 91, 96
+  orig: 91, 96
+  offset: 0, 0
+  index: -1
+枪类/波纹
+  rotate: true
+  xy: 480, 139
+  size: 163, 61
+  orig: 165, 63
+  offset: 1, 1
+  index: -1
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas.meta b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas.meta
new file mode 100644
index 0000000..79d192b
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas.meta
@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "a8f105f8-f322-444a-8f08-e580505287f0",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json
new file mode 100644
index 0000000..bf53b43
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"74tS6ET+2aiCvq4T65+6w7xteLs","spine":"3.8.75","x":-38,"y":-44.29,"width":73.53,"height":96.18,"images":"./images/","audio":"../../../【新】西游对战/武器动效/"},"bones":[{"name":"root"},{"name":"bone","parent":"root","length":53.64,"rotation":119.68,"x":7.59,"y":-10.45,"scaleX":0.5,"scaleY":0.5},{"name":"bone2","parent":"bone","x":-22.01,"y":-0.46},{"name":"bone3","parent":"bone","x":76.68,"y":-0.57},{"name":"枪类/枪受击1","parent":"root","length":38.37,"rotation":34.8,"x":-0.16,"y":1.14,"scaleX":0.5,"scaleY":0.5},{"name":"枪类/a11","parent":"root","length":75.41,"rotation":0.05,"x":-102.84,"y":-16.37,"scaleX":0.6556,"scaleY":0.6556},{"name":"枪类/a12","parent":"root","length":75.41,"rotation":-0.65,"x":-102.84,"y":-16.37,"scaleX":0.6556,"scaleY":0.6556},{"name":"bone4","parent":"root","length":29.47,"rotation":1.08,"x":26.08,"y":-26.11,"scaleX":0.5,"scaleY":0.5},{"name":"枪类/等级5 装饰","parent":"bone4","x":-31.81,"y":52.7},{"name":"枪类/等级5 装饰2","parent":"bone4","x":-52.62,"y":107.34},{"name":"枪类/等级5 装饰3","parent":"bone4","x":-14.84,"y":137.59},{"name":"枪类/等级5 装饰4","parent":"bone4","x":40.43,"y":128.39},{"name":"枪类/等级5 装饰5","parent":"bone4","x":54.38,"y":91.4},{"name":"枪类/等级5 装饰6","parent":"bone4","x":42,"y":58.75},{"name":"技能落地受击","parent":"root","length":19.79,"rotation":0.74,"x":-197.04,"y":-17.05},{"name":"枪类/波纹","parent":"技能落地受击","length":17.56,"rotation":-90.74,"x":-0.07,"y":-3.04},{"name":"枪类/a13","parent":"root","length":75.41,"rotation":-2.52,"x":-102.84,"y":-19.15,"scaleX":0.6556,"scaleY":-0.6556},{"name":"电光","parent":"bone","length":100,"rotation":-0.56,"x":-43.02,"y":0.61,"scaleX":1.05,"scaleY":1.05},{"name":"枪类/刀光1","parent":"root","length":59.15,"rotation":163.45,"x":13.66,"y":-10.78,"scaleY":-1},{"name":"枪类/挥砍1","parent":"枪类/刀光1","length":12.29,"rotation":178.11,"x":79.5,"y":-1.39,"scaleX":1.2307,"scaleY":1.2307}],"slots":[{"name":"技能落地受击","bone":"技能落地受击"},{"name":"枪类/波纹","bone":"枪类/波纹"},{"name":"枪类/a11","bone":"枪类/a11"},{"name":"枪类/a13","bone":"枪类/a13"},{"name":"枪类/红缨枪","bone":"bone","attachment":"红缨枪"},{"name":"枪类/枪受击1","bone":"枪类/枪受击1"},{"name":"枪类/a12","bone":"枪类/a12","blend":"additive"},{"name":"电光","bone":"电光"},{"name":"枪类/刀光1","bone":"枪类/刀光1"},{"name":"枪类/挥砍1","bone":"枪类/挥砍1"}],"skins":[{"name":"default","attachments":{"枪类/枪受击1":{"枪类/枪受击1":{"rotation":-34.8,"width":86,"height":94},"枪类/枪受击2":{"x":-0.23,"y":-0.62,"rotation":-34.8,"width":85,"height":94},"枪类/枪受击3":{"x":-0.52,"y":-1.03,"rotation":-34.8,"width":83,"height":96},"枪类/枪受击4":{"x":-0.52,"y":-1.03,"rotation":-34.8,"width":91,"height":96}},"枪类/a11":{"枪类/a11":{"x":71.73,"y":-0.46,"scaleY":2.1253,"rotation":-0.57,"width":226,"height":47}},"枪类/a12":{"枪类/a11":{"x":71.73,"y":-0.46,"rotation":-0.57,"width":226,"height":47}},"枪类/a13":{"枪类/a11":{"x":71.73,"y":-0.46,"scaleY":2.1253,"rotation":-0.57,"width":226,"height":47}},"枪类/刀光1":{"枪类/刀光1":{"x":15.68,"y":-6.59,"rotation":-163.45,"width":251,"height":250},"枪类/刀光2":{"x":21.35,"y":-5.74,"rotation":-163.45,"width":239,"height":249},"枪类/刀光3":{"x":24.47,"y":-3.98,"rotation":-163.45,"width":232,"height":248},"枪类/刀光4":{"x":30.41,"y":-1.9,"rotation":-163.45,"width":218,"height":242},"枪类/刀光5":{"x":37.61,"y":-7.25,"rotation":-163.45,"width":202,"height":212},"枪类/刀光6":{"x":38.18,"y":-1.46,"rotation":-163.45,"width":191,"height":208}},"技能落地受击":{"枪类/技能落地受击1":{"x":-0.35,"y":8.55,"rotation":-0.74,"width":89,"height":53},"枪类/技能落地受击2":{"x":2.78,"y":18.02,"rotation":-0.74,"width":113,"height":78},"枪类/技能落地受击3":{"x":2.28,"y":18.02,"rotation":-0.74,"width":120,"height":76},"枪类/技能落地受击4":{"x":2.28,"y":18.52,"rotation":-0.74,"width":128,"height":71}},"枪类/波纹":{"枪类/波纹":{"x":-0.59,"y":2.57,"rotation":90,"width":165,"height":63}},"枪类/挥砍1":{"枪类/挥砍1":{"x":54.81,"y":6.07,"rotation":18.43,"width":177,"height":164},"枪类/挥砍2":{"x":54.81,"y":6.07,"rotation":18.43,"width":173,"height":164},"枪类/挥砍3":{"x":54.81,"y":6.07,"rotation":18.43,"width":167,"height":164},"枪类/挥砍4":{"x":51.28,"y":6.69,"rotation":18.43,"width":160,"height":161},"枪类/挥砍5":{"x":46.42,"y":11.4,"rotation":18.43,"width":151,"height":144},"枪类/挥砍6":{"x":48.46,"y":6.77,"rotation":18.43,"width":144,"height":141}}}},{"name":"红缨枪","attachments":{"枪类/红缨枪":{"红缨枪":{"name":"枪类/枪","x":33.51,"y":1.22,"scaleX":0.45,"scaleY":0.45,"rotation":-87.96,"width":119,"height":429}}}}],"animations":{"待机":{"slots":{"电光":{"attachment":[{"time":0.1667,"name":"枪类/电光1"},{"time":0.2333,"name":"枪类/电光2"},{"time":0.3,"name":"枪类/电光3"},{"time":0.3667,"name":"枪类/电光2"},{"time":0.4333,"name":"枪类/电光3"},{"time":0.5,"name":"枪类/电光4"},{"time":0.5667,"name":"枪类/电光5"},{"time":0.6333,"name":"枪类/电光6"},{"time":0.7,"name":null}]}},"bones":{"bone":{"rotate":[{"angle":-13.77},{"time":0.5,"angle":-12.18},{"time":1,"angle":-13.77}],"translate":[{"x":-0.69,"y":3.11},{"time":0.5,"x":-0.67,"y":1.83},{"time":1,"x":-0.69,"y":3.11}]},"电光":{"scale":[{"time":0.1667,"curve":"stepped"},{"time":0.3,"y":-1,"curve":"stepped"},{"time":0.3667}]}}},"攻击1":{"slots":{"电光":{"attachment":[{"time":0.2,"name":"枪类/电光1"},{"time":0.2667,"name":"枪类/电光2"},{"time":0.3333,"name":"枪类/电光3"},{"time":0.4,"name":"枪类/电光2"},{"time":0.4667,"name":"枪类/电光3"},{"time":0.5333,"name":"枪类/电光4"},{"time":0.6,"name":"枪类/电光5"},{"time":0.6667,"name":"枪类/电光6"},{"time":0.7333,"name":null}]},"枪类/a11":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]},"枪类/a13":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]},"枪类/a12":{"color":[{"time":0.3667,"color":"ffffff68","curve":"stepped"},{"time":0.5667,"color":"ffffff68"},{"time":0.6,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]}},"bones":{"bone":{"rotate":[{"angle":57.81}],"translate":[{"x":-0.69,"y":12.04},{"time":0.2,"x":1.53,"y":12.41},{"time":0.3,"x":8.34,"y":12.59},{"time":0.4,"x":-118.54,"y":10.97,"curve":"stepped"},{"time":0.6667,"x":-118.54,"y":10.97},{"time":1.3333,"x":-0.69,"y":12.04}],"scale":[{},{"time":0.3,"x":1.254,"y":1.165,"curve":"stepped"},{"time":0.6667,"x":1.254,"y":1.165},{"time":1.3333,"curve":"stepped"},{"time":1.5}]},"bone3":{"translate":[{"time":0.3333},{"time":0.4,"x":11.92,"y":1.41,"curve":"stepped"},{"time":0.4667,"x":11.92,"y":1.41},{"time":0.6}]},"电光":{"scale":[{"time":0.2,"curve":"stepped"},{"time":0.3333,"y":-1,"curve":"stepped"},{"time":0.4}]},"枪类/a11":{"rotate":[{"time":0.3667,"angle":0.26}],"translate":[{"time":0.3667,"x":-49.93,"y":20.54},{"time":0.4333,"x":-85.9,"y":20.54},{"time":0.5333,"x":-106.52,"y":20.54}],"scale":[{"time":0.3667,"x":1.201,"y":0.654}]},"枪类/a12":{"rotate":[{"time":0.3667,"angle":0.26}],"translate":[{"time":0.3667,"x":-48.77,"y":20.54},{"time":0.4333,"x":-85.21,"y":20.54},{"time":0.5333,"x":-106.52,"y":20.54}],"scale":[{"time":0.3667,"x":1.201,"y":1.201}]},"枪类/a13":{"rotate":[{"time":0.3667,"angle":0.26}],"translate":[{"time":0.3667,"x":-52.93,"y":20.77},{"time":0.4333,"x":-87.7,"y":20.67},{"time":0.5333,"x":-106.52,"y":20.54}],"scale":[{"time":0.3667,"x":1.201,"y":0.83}]}}},"攻击2":{"slots":{"电光":{"attachment":[{"time":0.3333,"name":"枪类/电光1"},{"time":0.4,"name":"枪类/电光2"},{"time":0.4667,"name":"枪类/电光3"},{"time":0.5333,"name":"枪类/电光2"},{"time":0.6,"name":"枪类/电光3"},{"time":0.6667,"name":"枪类/电光4"},{"time":0.7333,"name":"枪类/电光5"},{"time":0.8,"name":"枪类/电光6"},{"time":0.8667,"name":null}]},"枪类/a11":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.6,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffffff","curve":"stepped"},{"time":0.8667,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]},"枪类/a13":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.6,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffffff","curve":"stepped"},{"time":0.8667,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]},"枪类/a12":{"color":[{"time":0.3667,"color":"ffffff68","curve":"stepped"},{"time":0.5667,"color":"ffffff68"},{"time":0.6,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff68","curve":"stepped"},{"time":0.9,"color":"ffffff68"},{"time":0.9333,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]}},"bones":{"bone":{"rotate":[{"angle":57.81},{"time":0.2,"angle":56.53},{"time":0.3,"angle":57.39},{"time":0.4,"angle":57.81,"curve":"stepped"},{"time":0.5,"angle":57.81,"curve":"stepped"},{"time":0.6667,"angle":57.39},{"time":0.7667,"angle":63.71,"curve":"stepped"},{"time":1.0667,"angle":63.71},{"time":1.3667,"angle":57.81}],"translate":[{"x":-0.69,"y":12.04},{"time":0.2,"x":1.53,"y":12.41},{"time":0.3,"x":8.34,"y":12.59},{"time":0.4,"x":-118.54,"y":10.97,"curve":"stepped"},{"time":0.5,"x":-118.54,"y":10.97},{"time":0.6667,"x":8.34,"y":11.25},{"time":0.7667,"x":-85.41,"y":2.47,"curve":"stepped"},{"time":1.0667,"x":-85.41,"y":2.47},{"time":1.3667,"x":-0.69,"y":12.04}],"scale":[{},{"time":0.3,"x":1.254,"y":1.165,"curve":"stepped"},{"time":1.0667,"x":1.254,"y":1.165},{"time":1.3667,"curve":"stepped"},{"time":1.5}]},"bone3":{"translate":[{"time":0.4},{"time":0.4667,"x":11.92,"y":1.41,"curve":"stepped"},{"time":0.5333,"x":11.92,"y":1.41},{"time":0.6667}]},"枪类/a11":{"rotate":[{"time":0.3667,"angle":0.26,"curve":"stepped"},{"time":0.7667,"angle":5.64}],"translate":[{"time":0.3667,"x":-41.53,"y":20.54},{"time":0.4333,"x":-82.54,"y":20.54},{"time":0.5333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.7667,"x":-55.94,"y":2.95},{"time":0.8,"x":-63.6,"y":1.77},{"time":0.8667,"x":-73.85,"y":0.88},{"time":0.9,"x":-74.73,"y":2.08}],"scale":[{"time":0.3667,"x":1.201,"y":0.654}]},"枪类/a12":{"rotate":[{"time":0.3667,"angle":0.26,"curve":"stepped"},{"time":0.7667,"angle":5.64}],"translate":[{"time":0.3667,"x":-40.37,"y":20.54},{"time":0.4333,"x":-81.85,"y":20.54},{"time":0.5333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.7667,"x":-55.94,"y":2.95},{"time":0.8,"x":-63.6,"y":1.77},{"time":0.8667,"x":-73.85,"y":0.88},{"time":0.9,"x":-74.73,"y":2.08}],"scale":[{"time":0.3667,"x":1.201,"y":1.201}]},"枪类/a13":{"rotate":[{"time":0.3667,"angle":0.26,"curve":"stepped"},{"time":0.7667,"angle":5.64}],"translate":[{"time":0.3667,"x":-44.53,"y":20.77},{"time":0.4333,"x":-84.34,"y":20.67},{"time":0.5333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.7667,"x":-55.94,"y":2.95},{"time":0.8,"x":-63.6,"y":1.77},{"time":0.8667,"x":-73.85,"y":0.88},{"time":0.9,"x":-74.73,"y":2.08}],"scale":[{"time":0.3667,"x":1.201,"y":0.83}]},"电光":{"scale":[{"time":0.3333,"curve":"stepped"},{"time":0.4667,"y":-1,"curve":"stepped"},{"time":0.5333}]}}},"攻击3":{"slots":{"电光":{"attachment":[{"time":0.3333,"name":"枪类/电光1"},{"time":0.4,"name":"枪类/电光2"},{"time":0.4667,"name":"枪类/电光3"},{"time":0.5333,"name":"枪类/电光2"},{"time":0.6,"name":"枪类/电光3"},{"time":0.6667,"name":"枪类/电光4"},{"time":0.7333,"name":"枪类/电光5"},{"time":0.8,"name":"枪类/电光6"},{"time":0.8667,"name":null}]},"枪类/a11":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.6,"color":"ffffff00","curve":"stepped"},{"time":0.7,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":0.8333,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1.0667,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]},"枪类/a13":{"color":[{"time":0.5,"color":"ffffffff"},{"time":0.6,"color":"ffffff00","curve":"stepped"},{"time":0.7,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":0.8333,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1.0667,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]},"枪类/a12":{"color":[{"time":0.3667,"color":"ffffff68","curve":"stepped"},{"time":0.5667,"color":"ffffff68"},{"time":0.6,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff68","curve":"stepped"},{"time":0.7667,"color":"ffffff68"},{"time":0.8,"color":"ffffff00","curve":"stepped"},{"time":0.8333,"color":"ffffff68","curve":"stepped"},{"time":0.9667,"color":"ffffff68"},{"time":1,"color":"ffffff00"}],"attachment":[{"time":0.3667,"name":"枪类/a11"}]}},"bones":{"bone":{"rotate":[{"angle":57.81},{"time":0.2,"angle":56.53},{"time":0.3,"angle":57.39},{"time":0.4,"angle":57.81,"curve":"stepped"},{"time":0.5,"angle":57.81,"curve":"stepped"},{"time":0.5667,"angle":57.39},{"time":0.6667,"angle":55.04,"curve":"stepped"},{"time":0.7667,"angle":57.39},{"time":0.8667,"angle":63.71,"curve":"stepped"},{"time":1,"angle":63.71},{"time":1.3333,"angle":57.81}],"translate":[{"x":-0.69,"y":12.04},{"time":0.2,"x":1.53,"y":12.41},{"time":0.3,"x":8.34,"y":12.59},{"time":0.4,"x":-118.54,"y":10.97,"curve":"stepped"},{"time":0.5,"x":-118.54,"y":10.97},{"time":0.5667,"x":8.34,"y":11.25},{"time":0.6667,"x":-80.99,"y":17.43,"curve":"stepped"},{"time":0.7667,"x":8.34,"y":11.25},{"time":0.8667,"x":-85.41,"y":2.47,"curve":"stepped"},{"time":1,"x":-85.41,"y":2.47},{"time":1.3333,"x":-0.69,"y":12.04}],"scale":[{},{"time":0.3,"x":1.254,"y":1.165,"curve":"stepped"},{"time":1,"x":1.254,"y":1.165},{"time":1.3333,"curve":"stepped"},{"time":1.5}]},"bone3":{"translate":[{"time":0.4},{"time":0.4667,"x":11.92,"y":1.41,"curve":"stepped"},{"time":0.5333,"x":11.92,"y":1.41},{"time":0.6667}]},"枪类/a11":{"rotate":[{"time":0.3667,"angle":0.26,"curve":"stepped"},{"time":0.6333,"angle":-5.29,"curve":"stepped"},{"time":0.8333,"angle":3.77}],"translate":[{"time":0.3667,"x":-41.53,"y":20.54},{"time":0.4333,"x":-82.54,"y":20.54},{"time":0.5333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.6333,"x":-33.16,"y":27.63,"curve":"stepped"},{"time":0.6667,"x":-60.88,"y":29.94,"curve":"stepped"},{"time":0.7,"x":-60.44,"y":29.57,"curve":"stepped"},{"time":0.7333,"x":-70.3,"y":31.18},{"time":0.7667,"x":-74.23,"y":31.69,"curve":"stepped"},{"time":0.8333,"x":-35.19,"y":8.87},{"time":0.8667,"x":-63.6,"y":4.24},{"time":0.9333,"x":-73.85,"y":2.86},{"time":0.9667,"x":-74.73,"y":3.07}],"scale":[{"time":0.3667,"x":1.201,"y":0.654}]},"枪类/a12":{"rotate":[{"time":0.3667,"angle":0.26,"curve":"stepped"},{"time":0.6333,"angle":-5.29,"curve":"stepped"},{"time":0.8333,"angle":3.77}],"translate":[{"time":0.3667,"x":-40.37,"y":20.54},{"time":0.4333,"x":-81.85,"y":20.54},{"time":0.5333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.6333,"x":-33.16,"y":27.63,"curve":"stepped"},{"time":0.6667,"x":-60.88,"y":29.94,"curve":"stepped"},{"time":0.7,"x":-60.44,"y":29.57,"curve":"stepped"},{"time":0.7333,"x":-70.3,"y":31.18},{"time":0.7667,"x":-74.23,"y":31.69,"curve":"stepped"},{"time":0.8333,"x":-35.19,"y":8.87},{"time":0.8667,"x":-63.6,"y":4.24},{"time":0.9333,"x":-73.85,"y":2.86},{"time":0.9667,"x":-74.73,"y":3.07}],"scale":[{"time":0.3667,"x":1.201,"y":1.201}]},"枪类/a13":{"rotate":[{"time":0.3667,"angle":0.26,"curve":"stepped"},{"time":0.6333,"angle":-5.29,"curve":"stepped"},{"time":0.8333,"angle":3.77}],"translate":[{"time":0.3667,"x":-44.53,"y":20.77},{"time":0.4333,"x":-84.34,"y":20.67},{"time":0.5333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.6333,"x":-33.16,"y":27.63,"curve":"stepped"},{"time":0.6667,"x":-60.88,"y":29.94,"curve":"stepped"},{"time":0.7,"x":-60.44,"y":29.57,"curve":"stepped"},{"time":0.7333,"x":-70.3,"y":31.18},{"time":0.7667,"x":-74.23,"y":31.69,"curve":"stepped"},{"time":0.8333,"x":-35.19,"y":8.87},{"time":0.8667,"x":-63.6,"y":4.24},{"time":0.9333,"x":-73.85,"y":2.86},{"time":0.9667,"x":-74.73,"y":3.07}],"scale":[{"time":0.3667,"x":1.201,"y":0.83}]},"电光":{"scale":[{"time":0.3333,"curve":"stepped"},{"time":0.4667,"y":-1,"curve":"stepped"},{"time":0.5333}]}}},"攻击4+横扫":{"slots":{"电光":{"attachment":[{"time":0.2667,"name":"枪类/电光1"},{"time":0.3333,"name":"枪类/电光2"},{"time":0.3667,"name":"枪类/电光3"},{"time":0.4333,"name":"枪类/电光2"},{"time":0.5,"name":"枪类/电光3"},{"time":0.5333,"name":"枪类/电光4"},{"time":0.6,"name":"枪类/电光5"},{"time":0.6667,"name":"枪类/电光6"},{"time":0.7,"name":null}]},"枪类/刀光1":{"attachment":[{"time":1.1,"name":"枪类/刀光2"},{"time":1.1333,"name":"枪类/刀光3"},{"time":1.1667,"name":"枪类/刀光4"},{"time":1.2,"name":"枪类/刀光5"},{"time":1.2333,"name":"枪类/刀光6"},{"time":1.2667,"name":null}]},"枪类/a11":{"color":[{"time":0.4,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5667,"color":"ffffffff","curve":"stepped"},{"time":0.7667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}],"attachment":[{"time":0.3,"name":"枪类/a11"}]},"枪类/a13":{"color":[{"time":0.4,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5667,"color":"ffffffff","curve":"stepped"},{"time":0.7667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}],"attachment":[{"time":0.3,"name":"枪类/a11"}]},"枪类/挥砍1":{"attachment":[{"time":1.1,"name":"枪类/挥砍2"},{"time":1.1333,"name":"枪类/挥砍3"},{"time":1.1667,"name":"枪类/挥砍4"},{"time":1.2,"name":"枪类/挥砍5"},{"time":1.2333,"name":"枪类/挥砍6"},{"time":1.2667,"name":null}]},"枪类/a12":{"color":[{"time":0.3,"color":"ffffff68","curve":"stepped"},{"time":0.4667,"color":"ffffff68"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff68","curve":"stepped"},{"time":0.6667,"color":"ffffff68"},{"time":0.8,"color":"ffffff00"}],"attachment":[{"time":0.3,"name":"枪类/a11"}]}},"bones":{"bone":{"rotate":[{"angle":57.81},{"time":0.1667,"angle":56.53},{"time":0.2333,"angle":57.39},{"time":0.3333,"angle":57.81,"curve":"stepped"},{"time":0.4,"angle":57.81,"curve":"stepped"},{"time":0.4667,"angle":57.39},{"time":0.5333,"angle":55.04,"curve":"stepped"},{"time":0.6333,"angle":57.39},{"time":0.7,"angle":63.71,"curve":"stepped"},{"time":0.8,"angle":63.71},{"time":0.9667,"angle":117.35},{"time":1.0667,"angle":124.99},{"time":1.1,"angle":16.89},{"time":1.1667,"angle":-27.91},{"time":1.2667,"angle":-36.61},{"time":1.4333,"angle":57.81}],"translate":[{"x":-0.69,"y":12.04},{"time":0.1667,"x":1.53,"y":12.41},{"time":0.2333,"x":8.34,"y":12.59},{"time":0.3333,"x":-118.54,"y":10.97,"curve":"stepped"},{"time":0.4,"x":-118.54,"y":10.97},{"time":0.4667,"x":8.34,"y":11.25},{"time":0.5333,"x":-80.99,"y":17.43,"curve":"stepped"},{"time":0.6333,"x":8.34,"y":11.25},{"time":0.7,"x":-85.41,"y":2.47,"curve":"stepped"},{"time":0.8,"x":-85.41,"y":2.47},{"time":0.9667,"x":-38.97,"y":-36.06},{"time":1.0667,"x":-33.04,"y":-42.98},{"time":1.1,"x":-86.89,"y":55.66},{"time":1.1333,"x":-57.5,"y":70.31},{"time":1.1667,"x":-18.22,"y":82.99},{"time":1.2667,"x":-12.79,"y":85.46},{"time":1.4333,"x":-0.69,"y":12.04}],"scale":[{},{"time":0.2333,"x":1.254,"y":1.165,"curve":"stepped"},{"time":1.2667,"x":1.254,"y":1.165},{"time":1.4333,"curve":"stepped"},{"time":1.5}]},"bone3":{"translate":[{"time":0.3333},{"time":0.3667,"x":11.92,"y":1.41,"curve":"stepped"},{"time":0.4333,"x":11.92,"y":1.41},{"time":0.5333}]},"枪类/a11":{"rotate":[{"time":0.3,"angle":0.26,"curve":"stepped"},{"time":0.5333,"angle":-5.29,"curve":"stepped"},{"time":0.6667,"angle":3.77}],"translate":[{"time":0.3,"x":-41.53,"y":20.54},{"time":0.3667,"x":-82.54,"y":20.54},{"time":0.4333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.5333,"x":-60.88,"y":29.94,"curve":"stepped"},{"time":0.5667,"x":-60.44,"y":29.57,"curve":"stepped"},{"time":0.6,"x":-70.3,"y":31.18},{"time":0.6333,"x":-74.23,"y":31.69,"curve":"stepped"},{"time":0.6667,"x":-35.19,"y":8.87},{"time":0.7,"x":-63.6,"y":4.24},{"time":0.7667,"x":-73.85,"y":2.86},{"time":0.8,"x":-74.73,"y":3.07}],"scale":[{"time":0.3,"x":1.201,"y":0.654}]},"枪类/a12":{"rotate":[{"time":0.3,"angle":0.26,"curve":"stepped"},{"time":0.5333,"angle":-5.29,"curve":"stepped"},{"time":0.6667,"angle":3.77}],"translate":[{"time":0.3,"x":-40.37,"y":20.54},{"time":0.3667,"x":-81.85,"y":20.54},{"time":0.4333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.5333,"x":-60.88,"y":29.94,"curve":"stepped"},{"time":0.5667,"x":-60.44,"y":29.57,"curve":"stepped"},{"time":0.6,"x":-70.3,"y":31.18},{"time":0.6333,"x":-74.23,"y":31.69,"curve":"stepped"},{"time":0.6667,"x":-35.19,"y":8.87},{"time":0.7,"x":-63.6,"y":4.24},{"time":0.7667,"x":-73.85,"y":2.86},{"time":0.8,"x":-74.73,"y":3.07}],"scale":[{"time":0.3,"x":1.201,"y":1.201}]},"枪类/a13":{"rotate":[{"time":0.3,"angle":0.26,"curve":"stepped"},{"time":0.5333,"angle":-5.29,"curve":"stepped"},{"time":0.6667,"angle":3.77}],"translate":[{"time":0.3,"x":-44.53,"y":20.77},{"time":0.3667,"x":-84.34,"y":20.67},{"time":0.4333,"x":-89.72,"y":20.54,"curve":"stepped"},{"time":0.5333,"x":-60.88,"y":29.94,"curve":"stepped"},{"time":0.5667,"x":-60.44,"y":29.57,"curve":"stepped"},{"time":0.6,"x":-70.3,"y":31.18},{"time":0.6333,"x":-74.23,"y":31.69,"curve":"stepped"},{"time":0.6667,"x":-35.19,"y":8.87},{"time":0.7,"x":-63.6,"y":4.24},{"time":0.7667,"x":-73.85,"y":2.86},{"time":0.8,"x":-74.73,"y":3.07}],"scale":[{"time":0.3,"x":1.201,"y":0.83}]},"电光":{"scale":[{"time":0.2667,"curve":"stepped"},{"time":0.3667,"y":-1,"curve":"stepped"},{"time":0.4333}]},"枪类/刀光1":{"rotate":[{"time":1.1,"angle":3.79},{"time":1.1333,"angle":-34.52}],"translate":[{"time":1.1,"x":-86.46,"y":14.95},{"time":1.1333,"x":-73.48,"y":63.59}],"scale":[{"time":1.1,"x":1.214,"y":1.214},{"time":1.1667,"x":1.393,"y":1.393}]}}},"飞枪冲锋":{"slots":{"枪类/a11":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.3333,"color":"ffffff00"},{"time":0.6,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"},{"time":1.1667,"color":"ffffffff"},{"time":1.4333,"color":"ffffff00"},{"time":1.7333,"color":"ffffffff"},{"time":2,"color":"ffffff00"},{"time":2.3,"color":"ffffffff"},{"time":2.5667,"color":"ffffff00"},{"time":2.8667,"color":"ffffffff"},{"time":3.1333,"color":"ffffff00"},{"time":3.4333,"color":"ffffffff"},{"time":3.7,"color":"ffffff00"},{"time":4,"color":"ffffffff"},{"time":4.2667,"color":"ffffff00"},{"time":4.5667,"color":"ffffffff"},{"time":4.8333,"color":"ffffff00"},{"time":5.1333,"color":"ffffffff"},{"time":5.4,"color":"ffffff00"},{"time":5.7,"color":"ffffffff"},{"time":5.9667,"color":"ffffff00"}],"attachment":[{"time":0.4333,"name":"枪类/a11"}]},"枪类/a13":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.0667,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"},{"time":0.6,"color":"ffffff00"},{"time":0.9,"color":"ffffffff"},{"time":1.1667,"color":"ffffff00"},{"time":1.4667,"color":"ffffffff"},{"time":1.7333,"color":"ffffff00"},{"time":2.0333,"color":"ffffffff"},{"time":2.3,"color":"ffffff00"},{"time":2.6,"color":"ffffffff"},{"time":2.8667,"color":"ffffff00"},{"time":3.1667,"color":"ffffffff"},{"time":3.4333,"color":"ffffff00"},{"time":3.7333,"color":"ffffffff"},{"time":4,"color":"ffffff00"},{"time":4.3,"color":"ffffffff"},{"time":4.5667,"color":"ffffff00"},{"time":4.8667,"color":"ffffffff"},{"time":5.1333,"color":"ffffff00"},{"time":5.4333,"color":"ffffffff"},{"time":5.7,"color":"ffffff00"}],"attachment":[{"time":0.4333,"name":"枪类/a11"}]},"枪类/a12":{"color":[{"time":0.4333,"color":"ffffffcc"}],"attachment":[{"time":0.4333,"name":"枪类/a11"}]}},"bones":{"bone":{"rotate":[{"angle":57.81},{"time":0.3,"angle":57.39}],"translate":[{"x":-0.69,"y":12.04},{"time":0.3,"x":23.47,"y":8.61},{"time":0.4,"x":-30.16,"y":8.61}],"scale":[{},{"time":0.3,"x":1.254,"y":1.165}]},"枪类/a11":{"rotate":[{"time":0.4333,"angle":-0.97,"curve":"stepped"},{"time":0.5667,"angle":-1.54}],"translate":[{"x":-3.19,"y":18.51,"curve":"stepped"},{"time":0.3333,"x":-3.19,"y":18.51},{"time":0.6,"x":0.88,"y":18.51},{"time":0.8667,"x":-3.19,"y":18.51},{"time":1.1667,"x":0.88,"y":18.51},{"time":1.4333,"x":-3.19,"y":18.51},{"time":1.7333,"x":0.88,"y":18.51},{"time":2,"x":-3.19,"y":18.51},{"time":2.3,"x":0.88,"y":18.51},{"time":2.5667,"x":-3.19,"y":18.51},{"time":2.8667,"x":0.88,"y":18.51},{"time":3.1333,"x":-3.19,"y":18.51},{"time":3.4333,"x":0.88,"y":18.51},{"time":3.7,"x":-3.19,"y":18.51},{"time":4,"x":0.88,"y":18.51},{"time":4.2667,"x":-3.19,"y":18.51},{"time":4.5667,"x":0.88,"y":18.51},{"time":4.8333,"x":-3.19,"y":18.51},{"time":5.1333,"x":0.88,"y":18.51},{"time":5.4,"x":-3.19,"y":18.51},{"time":5.7,"x":0.88,"y":18.51},{"time":5.9667,"x":-3.19,"y":18.51}],"scale":[{"x":1.201,"y":1.201,"curve":"stepped"},{"time":0.3333,"x":1.201,"y":1.201},{"time":0.8333,"x":1.726,"y":1.201,"curve":"stepped"},{"time":0.8667,"x":1.201,"y":1.201},{"time":1.4,"x":1.726,"y":1.201,"curve":"stepped"},{"time":1.4333,"x":1.201,"y":1.201},{"time":1.9667,"x":1.726,"y":1.201,"curve":"stepped"},{"time":2,"x":1.201,"y":1.201},{"time":2.5333,"x":1.726,"y":1.201,"curve":"stepped"},{"time":2.5667,"x":1.201,"y":1.201},{"time":3.1,"x":1.726,"y":1.201,"curve":"stepped"},{"time":3.1333,"x":1.201,"y":1.201},{"time":3.6667,"x":1.726,"y":1.201,"curve":"stepped"},{"time":3.7,"x":1.201,"y":1.201},{"time":4.2333,"x":1.726,"y":1.201,"curve":"stepped"},{"time":4.2667,"x":1.201,"y":1.201},{"time":4.8,"x":1.726,"y":1.201,"curve":"stepped"},{"time":4.8333,"x":1.201,"y":1.201},{"time":5.3667,"x":1.726,"y":1.201,"curve":"stepped"},{"time":5.4,"x":1.201,"y":1.201},{"time":5.9333,"x":1.726,"y":1.201,"curve":"stepped"},{"time":6,"x":1.201,"y":1.201}]},"枪类/a12":{"rotate":[{"time":0.4333,"angle":-0.97,"curve":"stepped"},{"time":0.5667,"angle":-1.54}],"translate":[{"time":0.4333,"x":0.3,"y":17.01}],"scale":[{"time":0.4333,"x":1.201,"y":1.201,"curve":"stepped"},{"time":0.5667,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":0.7,"x":1.326,"y":1.326,"curve":"stepped"},{"time":0.8333,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":0.9667,"x":1.326,"y":1.326,"curve":"stepped"},{"time":1.1,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":1.2333,"x":1.326,"y":1.326,"curve":"stepped"},{"time":1.3667,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":1.5,"x":1.326,"y":1.326,"curve":"stepped"},{"time":1.6333,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":1.7667,"x":1.326,"y":1.326,"curve":"stepped"},{"time":1.9,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":2.0333,"x":1.326,"y":1.326,"curve":"stepped"},{"time":2.1667,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":2.3,"x":1.326,"y":1.326,"curve":"stepped"},{"time":2.4333,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":2.5667,"x":1.326,"y":1.326,"curve":"stepped"},{"time":2.7,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":2.8333,"x":1.326,"y":1.326,"curve":"stepped"},{"time":2.9667,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":3.1,"x":1.326,"y":1.326,"curve":"stepped"},{"time":3.2333,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":3.3667,"x":1.326,"y":1.326,"curve":"stepped"},{"time":3.5,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":3.6333,"x":1.326,"y":1.326,"curve":"stepped"},{"time":3.7667,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":3.9,"x":1.326,"y":1.326,"curve":"stepped"},{"time":4.0333,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":4.1667,"x":1.326,"y":1.326,"curve":"stepped"},{"time":4.3,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":4.4333,"x":1.326,"y":1.326,"curve":"stepped"},{"time":4.5667,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":4.7,"x":1.326,"y":1.326,"curve":"stepped"},{"time":4.8333,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":4.9667,"x":1.326,"y":1.326,"curve":"stepped"},{"time":5.1,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":5.2333,"x":1.326,"y":1.326,"curve":"stepped"},{"time":5.3667,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":5.5,"x":1.326,"y":1.326,"curve":"stepped"},{"time":5.6333,"x":1.326,"y":-1.326,"curve":"stepped"},{"time":5.7667,"x":1.326,"y":1.326,"curve":"stepped"},{"time":5.9,"x":1.326,"y":-1.326}]},"枪类/等级5 装饰2":{"rotate":[{"angle":-1.21},{"time":0.0667},{"time":0.4333,"angle":-5.46},{"time":0.7333},{"time":1.1,"angle":-5.46},{"time":1.4},{"time":1.7667,"angle":-5.46},{"time":2.0667},{"time":2.4333,"angle":-5.46},{"time":2.7333},{"time":3.1,"angle":-5.46},{"time":3.4},{"time":3.7667,"angle":-5.46},{"time":4.0667},{"time":4.4333,"angle":-5.46},{"time":4.7333},{"time":5.1,"angle":-5.46},{"time":5.4},{"time":5.7667,"angle":-5.46},{"time":6,"angle":-1.21}],"translate":[{"x":2.5,"y":0.39},{"time":0.0667},{"time":0.4333,"x":11.26,"y":1.77},{"time":0.7333},{"time":1.1,"x":11.26,"y":1.77},{"time":1.4},{"time":1.7667,"x":11.26,"y":1.77},{"time":2.0667},{"time":2.4333,"x":11.26,"y":1.77},{"time":2.7333},{"time":3.1,"x":11.26,"y":1.77},{"time":3.4},{"time":3.7667,"x":11.26,"y":1.77},{"time":4.0667},{"time":4.4333,"x":11.26,"y":1.77},{"time":4.7333},{"time":5.1,"x":11.26,"y":1.77},{"time":5.4},{"time":5.7667,"x":11.26,"y":1.77},{"time":6,"x":2.5,"y":0.39}]},"枪类/等级5 装饰3":{"rotate":[{"angle":-2.43},{"time":0.1333},{"time":0.5,"angle":-5.46},{"time":0.8},{"time":1.1667,"angle":-5.46},{"time":1.4667},{"time":1.8333,"angle":-5.46},{"time":2.1333},{"time":2.5,"angle":-5.46},{"time":2.8},{"time":3.1667,"angle":-5.46},{"time":3.4667},{"time":3.8333,"angle":-5.46},{"time":4.1333},{"time":4.5,"angle":-5.46},{"time":4.8},{"time":5.1667,"angle":-5.46},{"time":5.4667},{"time":5.8333,"angle":-5.46},{"time":6,"angle":-2.43}],"translate":[{"x":5,"y":0.79},{"time":0.1333},{"time":0.5,"x":11.26,"y":1.77},{"time":0.8},{"time":1.1667,"x":11.26,"y":1.77},{"time":1.4667},{"time":1.8333,"x":11.26,"y":1.77},{"time":2.1333},{"time":2.5,"x":11.26,"y":1.77},{"time":2.8},{"time":3.1667,"x":11.26,"y":1.77},{"time":3.4667},{"time":3.8333,"x":11.26,"y":1.77},{"time":4.1333},{"time":4.5,"x":11.26,"y":1.77},{"time":4.8},{"time":5.1667,"x":11.26,"y":1.77},{"time":5.4667},{"time":5.8333,"x":11.26,"y":1.77},{"time":6,"x":5,"y":0.79}]},"枪类/等级5 装饰4":{"rotate":[{"angle":-3.64},{"time":0.2},{"time":0.5667,"angle":-5.46},{"time":0.8667},{"time":1.2333,"angle":-5.46},{"time":1.5333},{"time":1.9,"angle":-5.46},{"time":2.2},{"time":2.5667,"angle":-5.46},{"time":2.8667},{"time":3.2333,"angle":-5.46},{"time":3.5333},{"time":3.9,"angle":-5.46},{"time":4.2},{"time":4.5667,"angle":-5.46},{"time":4.8667},{"time":5.2333,"angle":-5.46},{"time":5.5333},{"time":5.9,"angle":-5.46},{"time":6,"angle":-3.64}],"translate":[{"x":7.5,"y":1.18},{"time":0.2},{"time":0.5667,"x":11.26,"y":1.77},{"time":0.8667},{"time":1.2333,"x":11.26,"y":1.77},{"time":1.5333},{"time":1.9,"x":11.26,"y":1.77},{"time":2.2},{"time":2.5667,"x":11.26,"y":1.77},{"time":2.8667},{"time":3.2333,"x":11.26,"y":1.77},{"time":3.5333},{"time":3.9,"x":11.26,"y":1.77},{"time":4.2},{"time":4.5667,"x":11.26,"y":1.77},{"time":4.8667},{"time":5.2333,"x":11.26,"y":1.77},{"time":5.5333},{"time":5.9,"x":11.26,"y":1.77},{"time":6,"x":7.5,"y":1.18}]},"枪类/等级5 装饰5":{"rotate":[{"angle":-4.85},{"time":0.2667},{"time":0.6333,"angle":-5.46},{"time":0.9333},{"time":1.3,"angle":-5.46},{"time":1.6},{"time":1.9667,"angle":-5.46},{"time":2.2667},{"time":2.6333,"angle":-5.46},{"time":2.9333},{"time":3.3,"angle":-5.46},{"time":3.6},{"time":3.9667,"angle":-5.46},{"time":4.2667},{"time":4.6333,"angle":-5.46},{"time":4.9333},{"time":5.3,"angle":-5.46},{"time":5.6},{"time":5.9667,"angle":-5.46},{"time":6,"angle":-4.85}],"translate":[{"x":10,"y":1.57},{"time":0.2667},{"time":0.6333,"x":11.26,"y":1.77},{"time":0.9333},{"time":1.3,"x":11.26,"y":1.77},{"time":1.6},{"time":1.9667,"x":11.26,"y":1.77},{"time":2.2667},{"time":2.6333,"x":11.26,"y":1.77},{"time":2.9333},{"time":3.3,"x":11.26,"y":1.77},{"time":3.6},{"time":3.9667,"x":11.26,"y":1.77},{"time":4.2667},{"time":4.6333,"x":11.26,"y":1.77},{"time":4.9333},{"time":5.3,"x":11.26,"y":1.77},{"time":5.6},{"time":5.9667,"x":11.26,"y":1.77},{"time":6,"x":10,"y":1.57}]},"枪类/等级5 装饰":{"rotate":[{},{"time":0.3667,"angle":-6.43},{"time":0.6667},{"time":1.0333,"angle":-6.43},{"time":1.3333},{"time":1.7,"angle":-6.43},{"time":2},{"time":2.3667,"angle":-6.43},{"time":2.6667},{"time":3.0333,"angle":-6.43},{"time":3.3333},{"time":3.7,"angle":-6.43},{"time":4},{"time":4.3667,"angle":-6.43},{"time":4.6667},{"time":5.0333,"angle":-6.43},{"time":5.3333},{"time":5.7,"angle":-6.43},{"time":6}],"translate":[{},{"time":0.3667,"x":-2.04,"y":-8.86},{"time":0.6667},{"time":1.0333,"x":-2.04,"y":-8.86},{"time":1.3333},{"time":1.7,"x":-2.04,"y":-8.86},{"time":2},{"time":2.3667,"x":-2.04,"y":-8.86},{"time":2.6667},{"time":3.0333,"x":-2.04,"y":-8.86},{"time":3.3333},{"time":3.7,"x":-2.04,"y":-8.86},{"time":4},{"time":4.3667,"x":-2.04,"y":-8.86},{"time":4.6667},{"time":5.0333,"x":-2.04,"y":-8.86},{"time":5.3333},{"time":5.7,"x":-2.04,"y":-8.86},{"time":6}]},"枪类/等级5 装饰6":{"rotate":[{"angle":-5},{"time":0.2333},{"time":0.6,"angle":-6.43},{"time":0.9},{"time":1.2667,"angle":-6.43},{"time":1.5667},{"time":1.9333,"angle":-6.43},{"time":2.2333},{"time":2.6,"angle":-6.43},{"time":2.9},{"time":3.2667,"angle":-6.43},{"time":3.5667},{"time":3.9333,"angle":-6.43},{"time":4.2333},{"time":4.6,"angle":-6.43},{"time":4.9},{"time":5.2667,"angle":-6.43},{"time":5.5667},{"time":5.9333,"angle":-6.43},{"time":6,"angle":-5}],"translate":[{"x":-1.59,"y":-6.89},{"time":0.2333},{"time":0.6,"x":-2.04,"y":-8.86},{"time":0.9},{"time":1.2667,"x":-2.04,"y":-8.86},{"time":1.5667},{"time":1.9333,"x":-2.04,"y":-8.86},{"time":2.2333},{"time":2.6,"x":-2.04,"y":-8.86},{"time":2.9},{"time":3.2667,"x":-2.04,"y":-8.86},{"time":3.5667},{"time":3.9333,"x":-2.04,"y":-8.86},{"time":4.2333},{"time":4.6,"x":-2.04,"y":-8.86},{"time":4.9},{"time":5.2667,"x":-2.04,"y":-8.86},{"time":5.5667},{"time":5.9333,"x":-2.04,"y":-8.86},{"time":6,"x":-1.59,"y":-6.89}]},"bone4":{"translate":[{"y":-7.6},{"time":0.3,"y":-1.9},{"time":0.4667,"x":-21.28}]},"枪类/a13":{"rotate":[{"time":0.4333,"angle":-0.97,"curve":"stepped"},{"time":0.5667,"angle":-1.54}],"translate":[{"x":-3.19,"y":18.51,"curve":"stepped"},{"time":0.0667,"x":-3.19,"y":18.51},{"time":0.3333,"x":0.88,"y":18.51},{"time":0.6,"x":-3.19,"y":18.51},{"time":0.9,"x":0.88,"y":18.51},{"time":1.1667,"x":-3.19,"y":18.51},{"time":1.4667,"x":0.88,"y":18.51},{"time":1.7333,"x":-3.19,"y":18.51},{"time":2.0333,"x":0.88,"y":18.51},{"time":2.3,"x":-3.19,"y":18.51},{"time":2.6,"x":0.88,"y":18.51},{"time":2.8667,"x":-3.19,"y":18.51},{"time":3.1667,"x":0.88,"y":18.51},{"time":3.4333,"x":-3.19,"y":18.51},{"time":3.7333,"x":0.88,"y":18.51},{"time":4,"x":-3.19,"y":18.51},{"time":4.3,"x":0.88,"y":18.51},{"time":4.5667,"x":-3.19,"y":18.51},{"time":4.8667,"x":0.88,"y":18.51},{"time":5.1333,"x":-3.19,"y":18.51},{"time":5.4333,"x":0.88,"y":18.51},{"time":5.7,"x":-3.19,"y":18.51}],"scale":[{"x":1.201,"y":1.201,"curve":"stepped"},{"time":0.0667,"x":1.201,"y":1.201},{"time":0.5667,"x":1.726,"y":1.201,"curve":"stepped"},{"time":0.6,"x":1.201,"y":1.201},{"time":1.1333,"x":1.726,"y":1.201,"curve":"stepped"},{"time":1.1667,"x":1.201,"y":1.201},{"time":1.7,"x":1.726,"y":1.201,"curve":"stepped"},{"time":1.7333,"x":1.201,"y":1.201},{"time":2.2667,"x":1.726,"y":1.201,"curve":"stepped"},{"time":2.3,"x":1.201,"y":1.201},{"time":2.8333,"x":1.726,"y":1.201,"curve":"stepped"},{"time":2.8667,"x":1.201,"y":1.201},{"time":3.4,"x":1.726,"y":1.201,"curve":"stepped"},{"time":3.4333,"x":1.201,"y":1.201},{"time":3.9667,"x":1.726,"y":1.201,"curve":"stepped"},{"time":4,"x":1.201,"y":1.201},{"time":4.5333,"x":1.726,"y":1.201,"curve":"stepped"},{"time":4.5667,"x":1.201,"y":1.201},{"time":5.1,"x":1.726,"y":1.201,"curve":"stepped"},{"time":5.1333,"x":1.201,"y":1.201},{"time":5.6667,"x":1.726,"y":1.201,"curve":"stepped"},{"time":5.7333,"x":1.201,"y":1.201}]}}}}}
\ No newline at end of file
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json.meta b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json.meta
new file mode 100644
index 0000000..05d404c
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "542e1bba-b475-48e1-93b2-89480d605a79",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "a8f105f8-f322-444a-8f08-e580505287f0"
+  }
+}
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png
new file mode 100644
index 0000000..5adf255
Binary files /dev/null and b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png differ
diff --git a/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png.meta b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png.meta
new file mode 100644
index 0000000..45ed513
--- /dev/null
+++ b/assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "090ff1ad-c3d7-4f22-afd7-609231fe9d08",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@6c48a",
+      "displayName": "枪类武器+专属技能",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "090ff1ad-c3d7-4f22-afd7-609231fe9d08",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@f9941",
+      "displayName": "枪类武器+专属技能",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1058,
+        "height": 543,
+        "rawWidth": 1058,
+        "rawHeight": 543,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -529,
+            -271.5,
+            0,
+            529,
+            -271.5,
+            0,
+            -529,
+            271.5,
+            0,
+            529,
+            271.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            543,
+            1058,
+            543,
+            0,
+            0,
+            1058,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -529,
+            -271.5,
+            0
+          ],
+          "maxPos": [
+            529,
+            271.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@6c48a"
+  }
+}
diff --git a/assets/res/spine/likeRole/数字.meta b/assets/res/spine/likeRole/数字.meta
new file mode 100644
index 0000000..fd5f194
--- /dev/null
+++ b/assets/res/spine/likeRole/数字.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "d9a72bf0-7c2a-463c-b688-37c66a8f7694",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/res/spine/likeRole/数字1/数字1.atlas b/assets/res/spine/likeRole/数字/数字1.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字1/数字1.atlas
rename to assets/res/spine/likeRole/数字/数字1.atlas
diff --git a/assets/res/spine/likeRole/数字1/数字1.atlas.meta b/assets/res/spine/likeRole/数字/数字1.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字1/数字1.atlas.meta
rename to assets/res/spine/likeRole/数字/数字1.atlas.meta
diff --git a/assets/res/spine/likeRole/数字1/数字1.json b/assets/res/spine/likeRole/数字/数字1.json
similarity index 100%
rename from assets/res/spine/likeRole/数字1/数字1.json
rename to assets/res/spine/likeRole/数字/数字1.json
diff --git a/assets/res/spine/likeRole/数字1/数字1.json.meta b/assets/res/spine/likeRole/数字/数字1.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字1/数字1.json.meta
rename to assets/res/spine/likeRole/数字/数字1.json.meta
diff --git a/assets/res/spine/likeRole/数字1/数字1.png b/assets/res/spine/likeRole/数字/数字1.png
similarity index 100%
rename from assets/res/spine/likeRole/数字1/数字1.png
rename to assets/res/spine/likeRole/数字/数字1.png
diff --git a/assets/res/spine/likeRole/数字1/数字1.png.meta b/assets/res/spine/likeRole/数字/数字1.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字1/数字1.png.meta
rename to assets/res/spine/likeRole/数字/数字1.png.meta
diff --git a/assets/res/spine/likeRole/数字1024/数字1024.atlas b/assets/res/spine/likeRole/数字/数字1024.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字1024/数字1024.atlas
rename to assets/res/spine/likeRole/数字/数字1024.atlas
diff --git a/assets/res/spine/likeRole/数字1024/数字1024.atlas.meta b/assets/res/spine/likeRole/数字/数字1024.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字1024/数字1024.atlas.meta
rename to assets/res/spine/likeRole/数字/数字1024.atlas.meta
diff --git a/assets/res/spine/likeRole/数字1024/数字1024.json b/assets/res/spine/likeRole/数字/数字1024.json
similarity index 100%
rename from assets/res/spine/likeRole/数字1024/数字1024.json
rename to assets/res/spine/likeRole/数字/数字1024.json
diff --git a/assets/res/spine/likeRole/数字1024/数字1024.json.meta b/assets/res/spine/likeRole/数字/数字1024.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字1024/数字1024.json.meta
rename to assets/res/spine/likeRole/数字/数字1024.json.meta
diff --git a/assets/res/spine/likeRole/数字1024/数字1024.png b/assets/res/spine/likeRole/数字/数字1024.png
similarity index 100%
rename from assets/res/spine/likeRole/数字1024/数字1024.png
rename to assets/res/spine/likeRole/数字/数字1024.png
diff --git a/assets/res/spine/likeRole/数字1024/数字1024.png.meta b/assets/res/spine/likeRole/数字/数字1024.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字1024/数字1024.png.meta
rename to assets/res/spine/likeRole/数字/数字1024.png.meta
diff --git a/assets/res/spine/likeRole/数字128/数字128.atlas b/assets/res/spine/likeRole/数字/数字128.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字128/数字128.atlas
rename to assets/res/spine/likeRole/数字/数字128.atlas
diff --git a/assets/res/spine/likeRole/数字128/数字128.atlas.meta b/assets/res/spine/likeRole/数字/数字128.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字128/数字128.atlas.meta
rename to assets/res/spine/likeRole/数字/数字128.atlas.meta
diff --git a/assets/res/spine/likeRole/数字128/数字128.json b/assets/res/spine/likeRole/数字/数字128.json
similarity index 100%
rename from assets/res/spine/likeRole/数字128/数字128.json
rename to assets/res/spine/likeRole/数字/数字128.json
diff --git a/assets/res/spine/likeRole/数字128/数字128.json.meta b/assets/res/spine/likeRole/数字/数字128.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字128/数字128.json.meta
rename to assets/res/spine/likeRole/数字/数字128.json.meta
diff --git a/assets/res/spine/likeRole/数字128/数字128.png b/assets/res/spine/likeRole/数字/数字128.png
similarity index 100%
rename from assets/res/spine/likeRole/数字128/数字128.png
rename to assets/res/spine/likeRole/数字/数字128.png
diff --git a/assets/res/spine/likeRole/数字128/数字128.png.meta b/assets/res/spine/likeRole/数字/数字128.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字128/数字128.png.meta
rename to assets/res/spine/likeRole/数字/数字128.png.meta
diff --git a/assets/res/spine/likeRole/数字16/数字16.atlas b/assets/res/spine/likeRole/数字/数字16.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字16/数字16.atlas
rename to assets/res/spine/likeRole/数字/数字16.atlas
diff --git a/assets/res/spine/likeRole/数字16/数字16.atlas.meta b/assets/res/spine/likeRole/数字/数字16.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字16/数字16.atlas.meta
rename to assets/res/spine/likeRole/数字/数字16.atlas.meta
diff --git a/assets/res/spine/likeRole/数字16/数字16.json b/assets/res/spine/likeRole/数字/数字16.json
similarity index 100%
rename from assets/res/spine/likeRole/数字16/数字16.json
rename to assets/res/spine/likeRole/数字/数字16.json
diff --git a/assets/res/spine/likeRole/数字16/数字16.json.meta b/assets/res/spine/likeRole/数字/数字16.json.meta
similarity index 79%
rename from assets/res/spine/likeRole/数字16/数字16.json.meta
rename to assets/res/spine/likeRole/数字/数字16.json.meta
index 84e5029..194de2f 100644
--- a/assets/res/spine/likeRole/数字16/数字16.json.meta
+++ b/assets/res/spine/likeRole/数字/数字16.json.meta
@@ -2,7 +2,7 @@
   "ver": "1.2.7",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "ee9c0c4b-851f-4f02-beb6-c3b719e3fa9d",
+  "uuid": "95f5d4e0-f589-4e29-8f31-6483e457efcf",
   "files": [
     ".json"
   ],
diff --git a/assets/res/spine/likeRole/数字16/数字16.png b/assets/res/spine/likeRole/数字/数字16.png
similarity index 100%
rename from assets/res/spine/likeRole/数字16/数字16.png
rename to assets/res/spine/likeRole/数字/数字16.png
diff --git a/assets/res/spine/likeRole/数字16/数字16.png.meta b/assets/res/spine/likeRole/数字/数字16.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字16/数字16.png.meta
rename to assets/res/spine/likeRole/数字/数字16.png.meta
diff --git a/assets/res/spine/likeRole/数字2/数字2.atlas b/assets/res/spine/likeRole/数字/数字2.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字2/数字2.atlas
rename to assets/res/spine/likeRole/数字/数字2.atlas
diff --git a/assets/res/spine/likeRole/数字2/数字2.atlas.meta b/assets/res/spine/likeRole/数字/数字2.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字2/数字2.atlas.meta
rename to assets/res/spine/likeRole/数字/数字2.atlas.meta
diff --git a/assets/res/spine/likeRole/数字2/数字2.json b/assets/res/spine/likeRole/数字/数字2.json
similarity index 100%
rename from assets/res/spine/likeRole/数字2/数字2.json
rename to assets/res/spine/likeRole/数字/数字2.json
diff --git a/assets/res/spine/likeRole/数字2/数字2.json.meta b/assets/res/spine/likeRole/数字/数字2.json.meta
similarity index 79%
rename from assets/res/spine/likeRole/数字2/数字2.json.meta
rename to assets/res/spine/likeRole/数字/数字2.json.meta
index 6a50aff..49f537b 100644
--- a/assets/res/spine/likeRole/数字2/数字2.json.meta
+++ b/assets/res/spine/likeRole/数字/数字2.json.meta
@@ -2,7 +2,7 @@
   "ver": "1.2.7",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "63c3559c-ff6d-439e-ae2e-bb17ffa60f04",
+  "uuid": "92bf30d8-bc81-4826-8b8c-c9b5b9dcc2fd",
   "files": [
     ".json"
   ],
diff --git a/assets/res/spine/likeRole/数字2/数字2.png b/assets/res/spine/likeRole/数字/数字2.png
similarity index 100%
rename from assets/res/spine/likeRole/数字2/数字2.png
rename to assets/res/spine/likeRole/数字/数字2.png
diff --git a/assets/res/spine/likeRole/数字2/数字2.png.meta b/assets/res/spine/likeRole/数字/数字2.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字2/数字2.png.meta
rename to assets/res/spine/likeRole/数字/数字2.png.meta
diff --git a/assets/res/spine/likeRole/数字2048/数字2048.atlas b/assets/res/spine/likeRole/数字/数字2048.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字2048/数字2048.atlas
rename to assets/res/spine/likeRole/数字/数字2048.atlas
diff --git a/assets/res/spine/likeRole/数字2048/数字2048.atlas.meta b/assets/res/spine/likeRole/数字/数字2048.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字2048/数字2048.atlas.meta
rename to assets/res/spine/likeRole/数字/数字2048.atlas.meta
diff --git a/assets/res/spine/likeRole/数字2048/数字2048.json b/assets/res/spine/likeRole/数字/数字2048.json
similarity index 100%
rename from assets/res/spine/likeRole/数字2048/数字2048.json
rename to assets/res/spine/likeRole/数字/数字2048.json
diff --git a/assets/res/spine/likeRole/数字2048/数字2048.json.meta b/assets/res/spine/likeRole/数字/数字2048.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字2048/数字2048.json.meta
rename to assets/res/spine/likeRole/数字/数字2048.json.meta
diff --git a/assets/res/spine/likeRole/数字2048/数字2048.png b/assets/res/spine/likeRole/数字/数字2048.png
similarity index 100%
rename from assets/res/spine/likeRole/数字2048/数字2048.png
rename to assets/res/spine/likeRole/数字/数字2048.png
diff --git a/assets/res/spine/likeRole/数字2048/数字2048.png.meta b/assets/res/spine/likeRole/数字/数字2048.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字2048/数字2048.png.meta
rename to assets/res/spine/likeRole/数字/数字2048.png.meta
diff --git a/assets/res/spine/likeRole/数字256/数字256.atlas b/assets/res/spine/likeRole/数字/数字256.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字256/数字256.atlas
rename to assets/res/spine/likeRole/数字/数字256.atlas
diff --git a/assets/res/spine/likeRole/数字256/数字256.atlas.meta b/assets/res/spine/likeRole/数字/数字256.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字256/数字256.atlas.meta
rename to assets/res/spine/likeRole/数字/数字256.atlas.meta
diff --git a/assets/res/spine/likeRole/数字256/数字256.json b/assets/res/spine/likeRole/数字/数字256.json
similarity index 100%
rename from assets/res/spine/likeRole/数字256/数字256.json
rename to assets/res/spine/likeRole/数字/数字256.json
diff --git a/assets/res/spine/likeRole/数字256/数字256.json.meta b/assets/res/spine/likeRole/数字/数字256.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字256/数字256.json.meta
rename to assets/res/spine/likeRole/数字/数字256.json.meta
diff --git a/assets/res/spine/likeRole/数字256/数字256.png b/assets/res/spine/likeRole/数字/数字256.png
similarity index 100%
rename from assets/res/spine/likeRole/数字256/数字256.png
rename to assets/res/spine/likeRole/数字/数字256.png
diff --git a/assets/res/spine/likeRole/数字256/数字256.png.meta b/assets/res/spine/likeRole/数字/数字256.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字256/数字256.png.meta
rename to assets/res/spine/likeRole/数字/数字256.png.meta
diff --git a/assets/res/spine/likeRole/数字32/数字32.atlas b/assets/res/spine/likeRole/数字/数字32.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字32/数字32.atlas
rename to assets/res/spine/likeRole/数字/数字32.atlas
diff --git a/assets/res/spine/likeRole/数字32/数字32.atlas.meta b/assets/res/spine/likeRole/数字/数字32.atlas.meta
similarity index 73%
rename from assets/res/spine/likeRole/数字32/数字32.atlas.meta
rename to assets/res/spine/likeRole/数字/数字32.atlas.meta
index 3f0fa59..1bbd466 100644
--- a/assets/res/spine/likeRole/数字32/数字32.atlas.meta
+++ b/assets/res/spine/likeRole/数字/数字32.atlas.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "ac3245b5-459b-4759-9637-80d8657602c2",
+  "uuid": "2ca749d7-5400-4251-bfd2-841d8bf80a8b",
   "files": [
     ".atlas",
     ".json"
diff --git a/assets/res/spine/likeRole/数字32/数字32.json b/assets/res/spine/likeRole/数字/数字32.json
similarity index 100%
rename from assets/res/spine/likeRole/数字32/数字32.json
rename to assets/res/spine/likeRole/数字/数字32.json
diff --git a/assets/res/spine/likeRole/数字32/数字32.json.meta b/assets/res/spine/likeRole/数字/数字32.json.meta
similarity index 56%
rename from assets/res/spine/likeRole/数字32/数字32.json.meta
rename to assets/res/spine/likeRole/数字/数字32.json.meta
index cfcf4cd..5ed69b1 100644
--- a/assets/res/spine/likeRole/数字32/数字32.json.meta
+++ b/assets/res/spine/likeRole/数字/数字32.json.meta
@@ -2,12 +2,12 @@
   "ver": "1.2.7",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "90700d70-3da1-40c0-9671-51f002407bc3",
+  "uuid": "2cec1a4c-5d6f-45f4-b432-f59ac52a3e0c",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "atlasUuid": "ac3245b5-459b-4759-9637-80d8657602c2"
+    "atlasUuid": "2ca749d7-5400-4251-bfd2-841d8bf80a8b"
   }
 }
diff --git a/assets/res/spine/likeRole/数字32/数字32.png b/assets/res/spine/likeRole/数字/数字32.png
similarity index 100%
rename from assets/res/spine/likeRole/数字32/数字32.png
rename to assets/res/spine/likeRole/数字/数字32.png
diff --git a/assets/res/spine/likeRole/数字32/数字32.png.meta b/assets/res/spine/likeRole/数字/数字32.png.meta
similarity index 86%
rename from assets/res/spine/likeRole/数字32/数字32.png.meta
rename to assets/res/spine/likeRole/数字/数字32.png.meta
index 705a2e6..96871a7 100644
--- a/assets/res/spine/likeRole/数字32/数字32.png.meta
+++ b/assets/res/spine/likeRole/数字/数字32.png.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "fda4371a-78d1-406a-b7c8-2ebc5111169a",
+  "uuid": "595f7f99-d909-405c-9831-21d440f944e7",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "fda4371a-78d1-406a-b7c8-2ebc5111169a@6c48a",
+      "uuid": "595f7f99-d909-405c-9831-21d440f944e7@6c48a",
       "displayName": "数字32",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fda4371a-78d1-406a-b7c8-2ebc5111169a",
+        "imageUuidOrDatabaseUri": "595f7f99-d909-405c-9831-21d440f944e7",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "fda4371a-78d1-406a-b7c8-2ebc5111169a@f9941",
+      "uuid": "595f7f99-d909-405c-9831-21d440f944e7@f9941",
       "displayName": "数字32",
       "id": "f9941",
       "name": "spriteFrame",
@@ -113,7 +113,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "fda4371a-78d1-406a-b7c8-2ebc5111169a@6c48a",
+        "imageUuidOrDatabaseUri": "595f7f99-d909-405c-9831-21d440f944e7@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": false,
     "hasAlpha": true,
-    "redirect": "fda4371a-78d1-406a-b7c8-2ebc5111169a@6c48a"
+    "redirect": "595f7f99-d909-405c-9831-21d440f944e7@6c48a"
   }
 }
diff --git a/assets/res/spine/likeRole/数字4/数字4.atlas b/assets/res/spine/likeRole/数字/数字4.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字4/数字4.atlas
rename to assets/res/spine/likeRole/数字/数字4.atlas
diff --git a/assets/res/spine/likeRole/数字4/数字4.atlas.meta b/assets/res/spine/likeRole/数字/数字4.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字4/数字4.atlas.meta
rename to assets/res/spine/likeRole/数字/数字4.atlas.meta
diff --git a/assets/res/spine/likeRole/数字4/数字4.json b/assets/res/spine/likeRole/数字/数字4.json
similarity index 100%
rename from assets/res/spine/likeRole/数字4/数字4.json
rename to assets/res/spine/likeRole/数字/数字4.json
diff --git a/assets/res/spine/likeRole/数字4/数字4.json.meta b/assets/res/spine/likeRole/数字/数字4.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字4/数字4.json.meta
rename to assets/res/spine/likeRole/数字/数字4.json.meta
diff --git a/assets/res/spine/likeRole/数字4/数字4.png b/assets/res/spine/likeRole/数字/数字4.png
similarity index 100%
rename from assets/res/spine/likeRole/数字4/数字4.png
rename to assets/res/spine/likeRole/数字/数字4.png
diff --git a/assets/res/spine/likeRole/数字4/数字4.png.meta b/assets/res/spine/likeRole/数字/数字4.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字4/数字4.png.meta
rename to assets/res/spine/likeRole/数字/数字4.png.meta
diff --git a/assets/res/spine/likeRole/数字4096/数字4096.atlas b/assets/res/spine/likeRole/数字/数字4096.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字4096/数字4096.atlas
rename to assets/res/spine/likeRole/数字/数字4096.atlas
diff --git a/assets/res/spine/likeRole/数字4096/数字4096.atlas.meta b/assets/res/spine/likeRole/数字/数字4096.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字4096/数字4096.atlas.meta
rename to assets/res/spine/likeRole/数字/数字4096.atlas.meta
diff --git a/assets/res/spine/likeRole/数字4096/数字4096.json b/assets/res/spine/likeRole/数字/数字4096.json
similarity index 100%
rename from assets/res/spine/likeRole/数字4096/数字4096.json
rename to assets/res/spine/likeRole/数字/数字4096.json
diff --git a/assets/res/spine/likeRole/数字4096/数字4096.json.meta b/assets/res/spine/likeRole/数字/数字4096.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字4096/数字4096.json.meta
rename to assets/res/spine/likeRole/数字/数字4096.json.meta
diff --git a/assets/res/spine/likeRole/数字4096/数字4096.png b/assets/res/spine/likeRole/数字/数字4096.png
similarity index 100%
rename from assets/res/spine/likeRole/数字4096/数字4096.png
rename to assets/res/spine/likeRole/数字/数字4096.png
diff --git a/assets/res/spine/likeRole/数字4096/数字4096.png.meta b/assets/res/spine/likeRole/数字/数字4096.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字4096/数字4096.png.meta
rename to assets/res/spine/likeRole/数字/数字4096.png.meta
diff --git a/assets/res/spine/likeRole/数字512/数字512.atlas b/assets/res/spine/likeRole/数字/数字512.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字512/数字512.atlas
rename to assets/res/spine/likeRole/数字/数字512.atlas
diff --git a/assets/res/spine/likeRole/数字512/数字512.atlas.meta b/assets/res/spine/likeRole/数字/数字512.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字512/数字512.atlas.meta
rename to assets/res/spine/likeRole/数字/数字512.atlas.meta
diff --git a/assets/res/spine/likeRole/数字512/数字512.json b/assets/res/spine/likeRole/数字/数字512.json
similarity index 100%
rename from assets/res/spine/likeRole/数字512/数字512.json
rename to assets/res/spine/likeRole/数字/数字512.json
diff --git a/assets/res/spine/likeRole/数字512/数字512.json.meta b/assets/res/spine/likeRole/数字/数字512.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字512/数字512.json.meta
rename to assets/res/spine/likeRole/数字/数字512.json.meta
diff --git a/assets/res/spine/likeRole/数字512/数字512.png b/assets/res/spine/likeRole/数字/数字512.png
similarity index 100%
rename from assets/res/spine/likeRole/数字512/数字512.png
rename to assets/res/spine/likeRole/数字/数字512.png
diff --git a/assets/res/spine/likeRole/数字512/数字512.png.meta b/assets/res/spine/likeRole/数字/数字512.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字512/数字512.png.meta
rename to assets/res/spine/likeRole/数字/数字512.png.meta
diff --git a/assets/res/spine/likeRole/数字64/数字64.atlas b/assets/res/spine/likeRole/数字/数字64.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字64/数字64.atlas
rename to assets/res/spine/likeRole/数字/数字64.atlas
diff --git a/assets/res/spine/likeRole/数字64/数字64.atlas.meta b/assets/res/spine/likeRole/数字/数字64.atlas.meta
similarity index 73%
rename from assets/res/spine/likeRole/数字64/数字64.atlas.meta
rename to assets/res/spine/likeRole/数字/数字64.atlas.meta
index 5c6af75..a61ee8b 100644
--- a/assets/res/spine/likeRole/数字64/数字64.atlas.meta
+++ b/assets/res/spine/likeRole/数字/数字64.atlas.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "8283b4c6-8fb8-4bf1-b88b-2b1f9c21e57b",
+  "uuid": "cccc823e-9212-4663-9685-a15206fcd9aa",
   "files": [
     ".atlas",
     ".json"
diff --git a/assets/res/spine/likeRole/数字64/数字64.json b/assets/res/spine/likeRole/数字/数字64.json
similarity index 100%
rename from assets/res/spine/likeRole/数字64/数字64.json
rename to assets/res/spine/likeRole/数字/数字64.json
diff --git a/assets/res/spine/likeRole/数字64/数字64.json.meta b/assets/res/spine/likeRole/数字/数字64.json.meta
similarity index 77%
rename from assets/res/spine/likeRole/数字64/数字64.json.meta
rename to assets/res/spine/likeRole/数字/数字64.json.meta
index e837d57..70a5cdc 100644
--- a/assets/res/spine/likeRole/数字64/数字64.json.meta
+++ b/assets/res/spine/likeRole/数字/数字64.json.meta
@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "atlasUuid": "8283b4c6-8fb8-4bf1-b88b-2b1f9c21e57b"
+    "atlasUuid": "cccc823e-9212-4663-9685-a15206fcd9aa"
   }
 }
diff --git a/assets/res/spine/likeRole/数字64/数字64.png b/assets/res/spine/likeRole/数字/数字64.png
similarity index 100%
rename from assets/res/spine/likeRole/数字64/数字64.png
rename to assets/res/spine/likeRole/数字/数字64.png
diff --git a/assets/res/spine/likeRole/数字64/数字64.png.meta b/assets/res/spine/likeRole/数字/数字64.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字64/数字64.png.meta
rename to assets/res/spine/likeRole/数字/数字64.png.meta
diff --git a/assets/res/spine/likeRole/数字8/数字8.atlas b/assets/res/spine/likeRole/数字/数字8.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字8/数字8.atlas
rename to assets/res/spine/likeRole/数字/数字8.atlas
diff --git a/assets/res/spine/likeRole/数字8/数字8.atlas.meta b/assets/res/spine/likeRole/数字/数字8.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字8/数字8.atlas.meta
rename to assets/res/spine/likeRole/数字/数字8.atlas.meta
diff --git a/assets/res/spine/likeRole/数字8/数字8.json b/assets/res/spine/likeRole/数字/数字8.json
similarity index 100%
rename from assets/res/spine/likeRole/数字8/数字8.json
rename to assets/res/spine/likeRole/数字/数字8.json
diff --git a/assets/res/spine/likeRole/数字8/数字8.json.meta b/assets/res/spine/likeRole/数字/数字8.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字8/数字8.json.meta
rename to assets/res/spine/likeRole/数字/数字8.json.meta
diff --git a/assets/res/spine/likeRole/数字8/数字8.png b/assets/res/spine/likeRole/数字/数字8.png
similarity index 100%
rename from assets/res/spine/likeRole/数字8/数字8.png
rename to assets/res/spine/likeRole/数字/数字8.png
diff --git a/assets/res/spine/likeRole/数字8/数字8.png.meta b/assets/res/spine/likeRole/数字/数字8.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字8/数字8.png.meta
rename to assets/res/spine/likeRole/数字/数字8.png.meta
diff --git a/assets/res/spine/likeRole/数字8192/数字8192.atlas b/assets/res/spine/likeRole/数字/数字8192.atlas
similarity index 100%
rename from assets/res/spine/likeRole/数字8192/数字8192.atlas
rename to assets/res/spine/likeRole/数字/数字8192.atlas
diff --git a/assets/res/spine/likeRole/数字8192/数字8192.atlas.meta b/assets/res/spine/likeRole/数字/数字8192.atlas.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字8192/数字8192.atlas.meta
rename to assets/res/spine/likeRole/数字/数字8192.atlas.meta
diff --git a/assets/res/spine/likeRole/数字8192/数字8192.json b/assets/res/spine/likeRole/数字/数字8192.json
similarity index 100%
rename from assets/res/spine/likeRole/数字8192/数字8192.json
rename to assets/res/spine/likeRole/数字/数字8192.json
diff --git a/assets/res/spine/likeRole/数字8192/数字8192.json.meta b/assets/res/spine/likeRole/数字/数字8192.json.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字8192/数字8192.json.meta
rename to assets/res/spine/likeRole/数字/数字8192.json.meta
diff --git a/assets/res/spine/likeRole/数字8192/数字8192.png b/assets/res/spine/likeRole/数字/数字8192.png
similarity index 100%
rename from assets/res/spine/likeRole/数字8192/数字8192.png
rename to assets/res/spine/likeRole/数字/数字8192.png
diff --git a/assets/res/spine/likeRole/数字8192/数字8192.png.meta b/assets/res/spine/likeRole/数字/数字8192.png.meta
similarity index 100%
rename from assets/res/spine/likeRole/数字8192/数字8192.png.meta
rename to assets/res/spine/likeRole/数字/数字8192.png.meta
diff --git a/assets/res/spine/likeRole/数字2.meta b/assets/res/spine/likeRole/数字2.meta
deleted file mode 100644
index 723739d..0000000
--- a/assets/res/spine/likeRole/数字2.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "68cd004c-115e-4e00-8f22-e207704f7676",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字2048.meta b/assets/res/spine/likeRole/数字2048.meta
deleted file mode 100644
index 396ad64..0000000
--- a/assets/res/spine/likeRole/数字2048.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "d1682f45-7577-46d3-a951-4921a5d6f216",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字256.meta b/assets/res/spine/likeRole/数字256.meta
deleted file mode 100644
index aae1f88..0000000
--- a/assets/res/spine/likeRole/数字256.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "54928076-230d-4bcb-a84a-3318d7dca05c",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字32.meta b/assets/res/spine/likeRole/数字32.meta
deleted file mode 100644
index 41b96af..0000000
--- a/assets/res/spine/likeRole/数字32.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "dcc32dbb-c266-4396-b211-58714bf7e29a",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字4.meta b/assets/res/spine/likeRole/数字4.meta
deleted file mode 100644
index a9b43eb..0000000
--- a/assets/res/spine/likeRole/数字4.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "7e824a13-c2b1-45bf-b1e8-3773d5bafffb",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字4096.meta b/assets/res/spine/likeRole/数字4096.meta
deleted file mode 100644
index 97c90d1..0000000
--- a/assets/res/spine/likeRole/数字4096.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "09beb02b-6565-4eae-a3de-5b8d1cad8aad",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字512.meta b/assets/res/spine/likeRole/数字512.meta
deleted file mode 100644
index 625ce99..0000000
--- a/assets/res/spine/likeRole/数字512.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "7b82268c-1880-418f-9556-be251e09d952",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字64.meta b/assets/res/spine/likeRole/数字64.meta
deleted file mode 100644
index ce97ced..0000000
--- a/assets/res/spine/likeRole/数字64.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "c9b9f640-7809-4cb1-a971-b3c2eac4aed2",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字8.meta b/assets/res/spine/likeRole/数字8.meta
deleted file mode 100644
index d2ba651..0000000
--- a/assets/res/spine/likeRole/数字8.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "5ca74d71-e731-4d63-ae3e-0a2d42d7aadd",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/res/spine/likeRole/数字8192.meta b/assets/res/spine/likeRole/数字8192.meta
deleted file mode 100644
index d6e2d03..0000000
--- a/assets/res/spine/likeRole/数字8192.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "75d83ea4-30ee-4a9b-9113-e7679ced7eaf",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/assets/script/battle/bag/BattleBagSession.ts b/assets/script/battle/bag/BattleBagSession.ts
index 1b095e7..00d74b3 100644
--- a/assets/script/battle/bag/BattleBagSession.ts
+++ b/assets/script/battle/bag/BattleBagSession.ts
@@ -902,7 +902,7 @@ export class BattleBagSession {
     }
 
     /**
-     * 英雄拖到当前解锁区域：符合条件则整区可放置并播 openSpine，随后英雄落在当前格。
+     * 五行字拖到当前解锁区域：类型/显示等级符合则整区可放置并播 openSpine，随后字落在当前格。
      * @param source 拖拽源
      * @param gridIndex 落点
      */
@@ -910,14 +910,12 @@ export class BattleBagSession {
         const grid = this.validator.getGridByIndex(gridIndex);
         if (!grid?.isAreaUnlock) return 'skip';
         const piece = this._sourcePiece(source);
-        if (piece.weapon2Id <= 0 && piece.weapon1Id <= 0) return 'skip';
-        if (piece.weapon2Id > 0) {
-            WeaponComposeConfigProvider.instance.load();
-            const w2Type = Number(WeaponComposeConfigProvider.instance.getWeapon2Type(piece.weapon2Id)) as Weapon2TileType;
-            if (w2Type !== Weapon2TileType.Single && w2Type !== Weapon2TileType.Combo) return 'skip';
-        }
+        if (!(piece.weapon2Id > 0)) return 'skip';
+        WeaponComposeConfigProvider.instance.load();
+        const w2Type = Math.floor(WeaponComposeConfigProvider.instance.getWeapon2Type(piece.weapon2Id));
+        if (w2Type < 1 || w2Type > 5) return 'skip';
 
-        const hit = this._map.areaUnlock.tryDrag(grid, this._heroOfPiece(piece));
+        const hit = this._map.areaUnlock.tryDrag(grid, this._heroOfGlyph(piece));
         if (hit === 'skip') return 'skip';
         if (hit === 'blocked') return PlaceRejectReason.WrongCellKind;
         const opened = this._map.areaUnlock.gridsOf(grid.unlockAreaId);
@@ -932,48 +930,36 @@ export class BattleBagSession {
     }
 
     /**
-     * 拖拽源上的文字与英雄 id。
+     * 拖拽源上的五行字 id 与显示等级。
      * @param source 拖拽源
      */
-    private _sourcePiece(source: DragSource): { weapon2Id: number; weapon1Id: number } {
+    private _sourcePiece(source: DragSource): { weapon2Id: number; level: number } {
         if (source.kind === 'bag') {
             const slot = this.merge.bag.getSlot(source.slotIndex);
             return {
                 weapon2Id: Number(slot?.weapon2Id) || 0,
-                weapon1Id: Number(slot?.weapon1Id) || Number(slot?.heroBind?.weapon1Id) || 0,
+                level: Math.floor(Number(slot?.level) || 0),
             };
         }
         const tile = this.merge.map.getTile(source.gridIndex);
         return {
             weapon2Id: Number(tile?.weapon2Id) || 0,
-            weapon1Id: Number(tile?.weapon1Id) || Number(tile?.heroBind?.weapon1Id) || 0,
+            level: Math.floor(Number(tile?.level) || 0),
         };
     }
 
     /**
-     * 拖动单位对应的英雄表类型和等级。单字按组成文字反查 Hero。
-     * @param piece 文字 id 与英雄 id
+     * 解锁判定用的英雄类型与显示等级（Text.type + 字块 level）。
+     * @param piece 文字 id 与显示等级
      */
-    private _heroOfPiece(piece: { weapon2Id: number; weapon1Id: number }): AreaUnlockHero | null {
-        const provider = WeaponComposeConfigProvider.instance;
-        provider.load();
-        let weapon1Id = piece.weapon1Id;
-        if (!(weapon1Id > 0) && piece.weapon2Id > 0) {
-            weapon1Id = provider.getWeapon1ByGroupSequence([piece.weapon2Id]) ?? 0;
-        }
-        if (!(weapon1Id > 0)) return null;
-        const row = gg.data.table.getTableData<ITableHero>(TableNames.Hero, weapon1Id);
-        if (!row) {
-            console.warn('[BattleBagSession] 解锁拖动找不到英雄', weapon1Id);
-            return null;
-        }
-        const heroType = Number(row.herotype);
-        const level = Number(row.level);
-        if (!Number.isFinite(heroType) || !Number.isFinite(level)) {
-            console.warn('[BattleBagSession] 英雄缺少 herotype 或 level', weapon1Id);
+    private _heroOfGlyph(piece: { weapon2Id: number; level: number }): AreaUnlockHero | null {
+        const heroType = Math.floor(WeaponComposeConfigProvider.instance.getWeapon2Type(piece.weapon2Id));
+        if (heroType < 1 || heroType > 5) return null;
+        if (!(piece.level > 0)) {
+            console.warn('[BattleBagSession] 解锁拖动缺少显示等级', piece.weapon2Id);
             return null;
         }
-        return { heroType, level };
+        return { heroType, level: piece.level };
     }
 
     /**
diff --git a/assets/script/battle/map/CocosBattleMapHost.ts b/assets/script/battle/map/CocosBattleMapHost.ts
index ee0fd9b..cf6f9b7 100644
--- a/assets/script/battle/map/CocosBattleMapHost.ts
+++ b/assets/script/battle/map/CocosBattleMapHost.ts
@@ -57,6 +57,8 @@ export class CocosBattleMapHost extends Component {
 
     unloadMap(): void {
         if (this._mapNode?.isValid) {
+            const mapMgr = this._mapNode.getComponent('MapManager') as MapManager | null;
+            mapMgr?.areaUnlock.clear();
             this._mapNode.destroy();
         }
         this._mapNode = null;
diff --git a/assets/script/battle/map/legacy/MapAreaUnlock.ts b/assets/script/battle/map/legacy/MapAreaUnlock.ts
index a60ea9d..a2a682a 100644
--- a/assets/script/battle/map/legacy/MapAreaUnlock.ts
+++ b/assets/script/battle/map/legacy/MapAreaUnlock.ts
@@ -1,6 +1,19 @@
+import { Label, Layout, Node, UITransform, Vec3, isValid } from 'cc';
 import { TableNames } from '../../../game/ConfigTableData';
+import { GBundle } from '../../../game/ConfigRes';
 import { MapGrid } from './MapGrid';
 
+/** 解锁条件气泡预制体路径 */
+const LOCK_TIP_PATH = 'prefab/';
+/** 解锁条件气泡预制体名 */
+const LOCK_TIP_NAME = '格子锁';
+/** 预制体上显示数字的子节点名 */
+const LOCK_TIP_NUM = 'num';
+/** 气泡世界坐标转本地时复用 */
+const _tipWorld = new Vec3();
+/** 气泡本地坐标复用 */
+const _tipLocal = new Vec3();
+
 /**
  * 拖英雄推进区域解锁的结果。
  * skip：不是解锁格，走原落子。
@@ -33,6 +46,8 @@ export class MapAreaUnlock {
     private _levelValue = 0;
     private _levelReady = false;
     private _warnedSprite = false;
+    /** 按阵营各挂一个条件气泡（镜像图不能把两边格子平均到地图中心） */
+    private _tips: Node[] = [];
 
     /**
      * 本局关卡与段位等级加值。加值来自 Rank.levelvalue。
@@ -44,6 +59,12 @@ export class MapAreaUnlock {
         this._levelValue = levelValue;
         this._levelReady = true;
         this._rollCurrent();
+        this.applyVisual();
+    }
+
+    /** 归还条件气泡（卸地图前调用） */
+    clear(): void {
+        this._releaseTips();
     }
 
     /**
@@ -117,6 +138,7 @@ export class MapAreaUnlock {
 
     /**
      * 刷新解锁区域皮：当前区域 Wait Unlocked，未轮到 Put，已解锁 Dig（由 MapGrid 按状态选图）。
+     * 同时把「格子锁」气泡放到当前待解锁区域所有格子的正中间。
      */
     applyVisual(): void {
         const current = this.currentId();
@@ -131,6 +153,190 @@ export class MapAreaUnlock {
             grid.waitingUnlock = wait;
             if (!wait && grid.isAreaUnlock) grid.updateGrid();
         }
+        this._refreshTip(current);
+    }
+
+    /**
+     * 按阵营分别在待解锁格子中心显示条件数字（Hero.number）。
+     * @param current 当前区域 ID；0 表示没有待解锁区
+     */
+    private _refreshTip(current: number): void {
+        if (current <= 0) {
+            this._hideTips();
+            return;
+        }
+        const index = this._indexOf(current);
+        if (index < 0 || !this._rolled[index]) {
+            this._hideTips();
+            return;
+        }
+        const groups = this._waitingGroups(current);
+        if (groups.length === 0) {
+            this._hideTips();
+            return;
+        }
+        const num = this._heroNumber(this._needLevels[index], this._heroTypes[index]);
+        if (!(num > 0)) {
+            this._hideTips();
+            return;
+        }
+        if (!this._ensureTips(groups.length, groups[0][0])) {
+            this._hideTips();
+            return;
+        }
+        for (let i = 0; i < groups.length; i++) {
+            const tip = this._tips[i];
+            if (!tip?.isValid) continue;
+            const numNode = tip.getChildByName(LOCK_TIP_NUM);
+            const label = numNode?.getComponent(Label);
+            if (!label) {
+                console.warn('[MapAreaUnlock] 格子锁缺少 num Label');
+                tip.active = false;
+                continue;
+            }
+            label.string = String(num);
+            tip.getComponent(Layout)?.updateLayout();
+            this._placeTipCenter(tip, groups[i]);
+            tip.active = true;
+        }
+        for (let i = groups.length; i < this._tips.length; i++) {
+            const tip = this._tips[i];
+            if (tip?.isValid) tip.active = false;
+        }
+    }
+
+    /**
+     * 当前区域待解锁格，按 CampAreaID 分组（每组各自取中心）。
+     * @param current 当前区域 ID
+     */
+    private _waitingGroups(current: number): MapGrid[][] {
+        const camps: number[] = [];
+        const groups: MapGrid[][] = [];
+        for (let i = 0; i < this._grids.length; i++) {
+            const grid = this._grids[i];
+            if (!grid?.isAreaUnlock || grid.unlockAreaId !== current) continue;
+            const camp = grid.CampAreaID;
+            let g = -1;
+            for (let j = 0; j < camps.length; j++) {
+                if (camps[j] === camp) {
+                    g = j;
+                    break;
+                }
+            }
+            if (g < 0) {
+                camps.push(camp);
+                groups.push([grid]);
+            } else {
+                groups[g].push(grid);
+            }
+        }
+        return groups;
+    }
+
+    /**
+     * 取解锁等级对应的 Hero.number（界面展示用）。
+     * @param level 需求等级（已含段位加值）
+     * @param heroType 需求英雄类型；0 为任意类型
+     */
+    private _heroNumber(level: number, heroType: number): number {
+        const heroes = gg.data.table.getTableList<ITableHero>(TableNames.Hero) ?? [];
+        for (let i = 0; i < heroes.length; i++) {
+            const hero = heroes[i];
+            if (Math.floor(Number(hero.level)) !== level) continue;
+            if (heroType > 0 && Math.floor(Number(hero.herotype)) !== heroType) continue;
+            const num = Math.floor(Number(hero.number));
+            if (num > 0) return num;
+        }
+        console.warn('[MapAreaUnlock] 找不到解锁等级对应 Hero.number', level, heroType);
+        return 0;
+    }
+
+    /**
+     * 确保气泡数量够用，并挂到地图根节点。
+     * @param count 需要的气泡数
+     * @param anchor 用于定位父节点的格子
+     */
+    private _ensureTips(count: number, anchor: MapGrid): boolean {
+        const mapRoot = anchor.node?.parent?.parent;
+        if (!mapRoot?.isValid) {
+            console.warn('[MapAreaUnlock] 找不到地图根节点');
+            return false;
+        }
+        if (typeof gg === 'undefined' || !gg.res?.getNode) {
+            console.warn('[MapAreaUnlock] gg.res 未就绪，无法加载格子锁');
+            return false;
+        }
+        while (this._tips.length < count) {
+            const tip = gg.res.getNode(LOCK_TIP_PATH, LOCK_TIP_NAME, GBundle.BattleGame);
+            if (!tip?.isValid) {
+                console.warn('[MapAreaUnlock] 缺少格子锁预制体', LOCK_TIP_NAME);
+                return this._tips.length > 0;
+            }
+            tip.parent = mapRoot;
+            tip.setSiblingIndex(mapRoot.children.length - 1);
+            this._tips.push(tip);
+        }
+        for (let i = 0; i < this._tips.length; i++) {
+            const tip = this._tips[i];
+            if (!tip?.isValid) continue;
+            if (tip.parent !== mapRoot) tip.parent = mapRoot;
+            tip.setSiblingIndex(mapRoot.children.length - 1);
+        }
+        return true;
+    }
+
+    /**
+     * 气泡放到该组格子世界坐标中心。
+     * @param tip 气泡节点
+     * @param grids 同阵营待解锁格子
+     */
+    private _placeTipCenter(tip: Node, grids: MapGrid[]): void {
+        let sx = 0;
+        let sy = 0;
+        let sz = 0;
+        let count = 0;
+        for (let i = 0; i < grids.length; i++) {
+            const node = grids[i]?.node;
+            if (!node?.isValid) continue;
+            const wp = node.worldPosition;
+            sx += wp.x;
+            sy += wp.y;
+            sz += wp.z;
+            count++;
+        }
+        if (count <= 0) {
+            console.warn('[MapAreaUnlock] 待解锁格子节点无效，无法定位气泡');
+            return;
+        }
+        _tipWorld.set(sx / count, sy / count, sz / count);
+        const parent = tip.parent;
+        const ut = parent?.getComponent(UITransform);
+        if (ut) {
+            ut.convertToNodeSpaceAR(_tipWorld, _tipLocal);
+            tip.setPosition(_tipLocal);
+            return;
+        }
+        tip.setWorldPosition(_tipWorld);
+    }
+
+    /** 隐藏全部气泡（本局内复用节点） */
+    private _hideTips(): void {
+        for (let i = 0; i < this._tips.length; i++) {
+            const tip = this._tips[i];
+            if (!tip?.isValid) continue;
+            tip.active = false;
+        }
+    }
+
+    /** 归还全部气泡到对象池 */
+    private _releaseTips(): void {
+        for (let i = 0; i < this._tips.length; i++) {
+            const tip = this._tips[i];
+            if (!tip || !isValid(tip)) continue;
+            if (tip['resKey']) gg.res.putNode(tip);
+            else tip.destroy();
+        }
+        this._tips.length = 0;
     }
 
     /** 给当前区域随机一条 unlockland 条件 */
diff --git a/assets/script/battle/map/legacy/MapManager.ts b/assets/script/battle/map/legacy/MapManager.ts
index 0a5542c..3003bcc 100644
--- a/assets/script/battle/map/legacy/MapManager.ts
+++ b/assets/script/battle/map/legacy/MapManager.ts
@@ -98,6 +98,10 @@ export class CocosMapView extends Component {
         this.ensureHeroParent();
     }
 
+    protected onDestroy(): void {
+        this.areaUnlock.clear();
+    }
+
     /** 格子后的英雄挂点，供 heroTemplate 使用（须始终压在格子层之上） */
     ensureHeroParent(): Node {
         if (this.heroParent?.isValid) {
diff --git a/assets/script/battle/view/CocosBagBoardView.ts b/assets/script/battle/view/CocosBagBoardView.ts
index 090b719..4df42ec 100644
--- a/assets/script/battle/view/CocosBagBoardView.ts
+++ b/assets/script/battle/view/CocosBagBoardView.ts
@@ -22,6 +22,7 @@ import {
     Weapon2TileType,
     canDragMapTile,
     canDragPrepType3Cell,
+    isElementGlyphType,
     PREP_TYPE3_MOVE_WINDOW_MS,
     rejectReasonToMessage,
     type ComposedUnit,
@@ -4142,24 +4143,22 @@ export class CocosBagBoardView {
 
         // 仅真正会升级时不交换
         if (this._isUpgradeMaterialAtMapDrop(slot, gridIndex)) return false;
-        // 同字可合成升级：不播交换；异级/满级交换
         if (!this._isMapMergeBlocked(gridIndex) && this._willSingleMergeUpgrade(slot, targetTile)) return false;
+        if (this._willElementMerge(slot, targetTile)) return false;
         if (this._isSameSingleWeaponPair(slot, targetTile)) return true;
 
         WeaponComposeConfigProvider.instance.load();
         const provider = WeaponComposeConfigProvider.instance;
         if (this._willKeepDigSwap(slot, targetTile)) return true;
-        const srcType = provider.getWeapon2Type(slot.weapon2Id) as Weapon2TileType;
-        const dstType = provider.getWeapon2Type(targetTile.weapon2Id) as Weapon2TileType;
+        const srcType = provider.getWeapon2Type(slot.weapon2Id);
+        const dstType = provider.getWeapon2Type(targetTile.weapon2Id);
+        if (!isElementGlyphType(srcType) || !isElementGlyphType(dstType)) return false;
 
-        const swappable = (t: Weapon2TileType) =>
-            t === Weapon2TileType.Single || t === Weapon2TileType.Combo;
-        if (!swappable(srcType) || !swappable(dstType)) return false;
-
-        const cellKind = this._bagSession.merge.map.getCellKind(gridIndex);
+        const cellKind = this._bagSession.validator.getLiveCellKind(gridIndex)
+            ?? this._bagSession.merge.map.getCellKind(gridIndex);
         if (cellKind !== MapCellKind.Put) return false;
 
-        return canDragMapTile(targetTile, dstType, false);
+        return canDragMapTile(targetTile, dstType as Weapon2TileType, false);
     }
 
     /** 地图字块落子到已占背包槽时，是否会与背包字块交换到地图 */
@@ -4182,22 +4181,21 @@ export class CocosBagBoardView {
         if (this._isUpgradeMaterialAtMapDrop(srcTile, toMapIndex, fromMapIndex)) return false;
         if (!this._isMapMergeBlocked(fromMapIndex) && !this._isMapMergeBlocked(toMapIndex)
             && this._willSingleMergeUpgrade(srcTile, dstTile)) return false;
+        if (this._willElementMerge(srcTile, dstTile)) return false;
         if (this._isSameSingleWeaponPair(srcTile, dstTile)) return true;
 
         WeaponComposeConfigProvider.instance.load();
         const provider = WeaponComposeConfigProvider.instance;
         if (this._willKeepDigSwap(srcTile, dstTile)) return true;
-        const srcType = provider.getWeapon2Type(srcTile.weapon2Id) as Weapon2TileType;
-        const dstType = provider.getWeapon2Type(dstTile.weapon2Id) as Weapon2TileType;
-
-        const swappable = (t: Weapon2TileType) =>
-            t === Weapon2TileType.Single || t === Weapon2TileType.Combo;
-        if (!swappable(srcType) || !swappable(dstType)) return false;
+        const srcType = provider.getWeapon2Type(srcTile.weapon2Id);
+        const dstType = provider.getWeapon2Type(dstTile.weapon2Id);
+        if (!isElementGlyphType(srcType) || !isElementGlyphType(dstType)) return false;
 
-        const cellKind = this._bagSession.merge.map.getCellKind(toMapIndex);
+        const cellKind = this._bagSession.validator.getLiveCellKind(toMapIndex)
+            ?? this._bagSession.merge.map.getCellKind(toMapIndex);
         if (cellKind !== MapCellKind.Put) return false;
 
-        return canDragMapTile(dstTile, dstType, false);
+        return canDragMapTile(dstTile, dstType as Weapon2TileType, false);
     }
 
     /**
@@ -4559,11 +4557,11 @@ export class CocosBagBoardView {
         return dragSourceToDefaultTarget(source);
     }
 
-    /** 以 TextGrid 实际挂接的背包槽为准 */
+    /** 以 TextGrid 实际挂接的背包槽为准（地图格也叫 gridN，必须先确认挂在 ui_textList 下） */
     private _resolveBagSlotIndexForTextGrid(grid: TextGrid): number | null {
         const parent = grid.node?.parent;
         if (!parent?.isValid || !this._bagList?.isValid) return null;
-        // 槽位下标 = 格子下标（gridN → N），temp 与其他节点返回 null
+        if (!this._isNodeUnderBagList(grid.node)) return null;
         return TextListLandHost.indexOfNode(parent);
     }
 
@@ -6048,7 +6046,9 @@ export class CocosBagBoardView {
         if (drag?.type3Backup) return true;
         if (grid.weapon2Id === GRID_WEAPON2_ID) return true;
         WeaponComposeConfigProvider.instance.load();
-        return WeaponComposeConfigProvider.instance.getWeapon2Type(grid.weapon2Id) === Weapon2TileType.Grid;
+        const t = WeaponComposeConfigProvider.instance.getWeapon2Type(grid.weapon2Id);
+        if (isElementGlyphType(t)) return false;
+        return t === Weapon2TileType.Grid;
     }
 
     /** 悬停格变化时才刷新路线预览（模拟 type3 落在该格） */
diff --git a/assets/script/battle/view/MapDragGuideHelper.ts b/assets/script/battle/view/MapDragGuideHelper.ts
index 053aa75..32a4f7d 100644
--- a/assets/script/battle/view/MapDragGuideHelper.ts
+++ b/assets/script/battle/view/MapDragGuideHelper.ts
@@ -1,6 +1,7 @@
 import {
     canDragMapTile,
     canDropWeapon2OnCell,
+    isElementGlyphType,
     MapCellKind,
     PlaceRejectReason,
     rejectReasonToMessage,
@@ -107,7 +108,7 @@ export class MapDragGuideHelper {
             }
             return hasTile ? 'none' : 'blocked';
         }
-        if (w2Type === Weapon2TileType.Single || w2Type === Weapon2TileType.Combo) {
+        if (isElementGlyphType(w2Type)) {
             // 可放置优先：双标 put+dig 允许落字
             if (mg.isCanPutText && !mg.isCanWalk) {
                 if (!session.validator.isAllowedCampForPlace(gridIndex)) return 'blocked';
@@ -121,7 +122,7 @@ export class MapDragGuideHelper {
             if (mg.isCanWalk || mg.isCanBeDig) return 'blocked';
             return 'none';
         }
-        if (w2Type === Weapon2TileType.Shovel) {
+        if (!isElementGlyphType(w2Type) && w2Type === Weapon2TileType.Shovel) {
             // 已可放置的双标不当挖格
             if (mg.isCanBeDig && !mg.isCanPutText && !mg.isCanWalk && !hasTile && mg.unlockAreaId <= 0) {
                 if (!session.validator.isAllowedCampForPlace(gridIndex)) return 'blocked';
@@ -257,7 +258,7 @@ export class MapDragGuideHelper {
         const w2Type = Number(
             WeaponComposeConfigProvider.instance.getWeapon2Type(weapon2Id),
         ) as Weapon2TileType;
-        if (w2Type !== Weapon2TileType.Grid) return false;
+        if (isElementGlyphType(w2Type) || w2Type !== Weapon2TileType.Grid) return false;
         if (WeaponComposeConfigProvider.instance.passiveSpawnKeepsDigCell(weapon2Id)) return false;
         if (!MapDragGuideHelper.hasSpiderWeb(mg)) return false;
         return MapDragGuideHelper.getMapDragDropState(session, w2Type, mg, { weapon2Id }) === 'blocked';
@@ -275,7 +276,7 @@ export class MapDragGuideHelper {
         const w2Type = Number(
             WeaponComposeConfigProvider.instance.getWeapon2Type(weapon2Id),
         ) as Weapon2TileType;
-        if (w2Type !== Weapon2TileType.Grid) return false;
+        if (isElementGlyphType(w2Type) || w2Type !== Weapon2TileType.Grid) return false;
         if (MapDragGuideHelper.hasSpiderWeb(mg)) return false;
         const cellKind = MapDragGuideHelper.liveCellKind(mg);
         const hasTile = session.merge.map.hasTile(gridIndex);
@@ -355,6 +356,17 @@ export class MapDragGuideHelper {
         WeaponComposeConfigProvider.instance.load();
         const provider = WeaponComposeConfigProvider.instance;
         const w2Type = Number(provider.getWeapon2Type(source.weapon2Id)) as Weapon2TileType;
+        if (isElementGlyphType(w2Type)) {
+            const tile = session.merge.map.getTile(gridIndex);
+            if (!tile) return false;
+            if (!session.validator.isAllowedCampForPlace(gridIndex)) return false;
+            if (source.fromMapGrid != null && source.fromMapGrid === gridIndex) return false;
+            const srcLevel = Math.floor(source.level ?? 1);
+            const dstLevel = Math.floor(tile.level ?? 1);
+            const dstType = Math.floor(provider.getWeapon2Type(tile.weapon2Id));
+            if (dstType !== w2Type || srcLevel !== dstLevel) return false;
+            return srcLevel < provider.getElementMaxLevel(w2Type);
+        }
         if (w2Type !== Weapon2TileType.Single && w2Type !== Weapon2TileType.Combo) {
             return false;
         }
@@ -409,15 +421,15 @@ export class MapDragGuideHelper {
         WeaponComposeConfigProvider.instance.load();
         const provider = WeaponComposeConfigProvider.instance;
         const srcType = Number(provider.getWeapon2Type(source.weapon2Id)) as Weapon2TileType;
-        if (srcType !== Weapon2TileType.Single && srcType !== Weapon2TileType.Combo) {
+        if (!isElementGlyphType(srcType)) {
             return false;
         }
         const tile = session.merge.map.getTile(gridIndex);
         if (!tile) return false;
         if (!session.validator.isAllowedCampForPlace(gridIndex)) return false;
-        if (session.merge.map.getCellKind(gridIndex) !== MapCellKind.Put) return false;
+        if (session.validator.getLiveCellKind(gridIndex) !== MapCellKind.Put) return false;
         const dstType = Number(provider.getWeapon2Type(tile.weapon2Id)) as Weapon2TileType;
-        if (dstType !== Weapon2TileType.Single && dstType !== Weapon2TileType.Combo) {
+        if (!isElementGlyphType(dstType)) {
             return false;
         }
         return canDragMapTile(tile, dstType, false);
diff --git a/assets/script/game/ResPkgBuilder.ts b/assets/script/game/ResPkgBuilder.ts
index 20d8c97..613dca3 100644
--- a/assets/script/game/ResPkgBuilder.ts
+++ b/assets/script/game/ResPkgBuilder.ts
@@ -47,6 +47,8 @@ export class ResPkgBuilder {
             { name: 'levelUpText', bundle: B.BattleMap, path: 'prefab/障碍物/', type: Prefab },
             { name: 'monsterTemplate', bundle: B.BattleGameMonster, path: PrefabPath, type: Prefab },
             { name: 'textGrid', bundle: B.BattleGame, path: PrefabPath, type: Prefab },
+            /** 地图区域解锁条件气泡 */
+            { name: '格子锁', bundle: B.BattleGame, path: PrefabPath, type: Prefab },
             /** buff 表现由下方 appendBattleHeroDirLoads 整目录覆盖，此处不再逐条 */
             /** 通用飘仙桃（coinFly） */
             { name: 'coinFly', bundle: B.BattleGame, path: PrefabPath, type: Prefab },
diff --git a/settings/v2/packages/information.json b/settings/v2/packages/information.json
index a231c25..7513fb4 100644
--- a/settings/v2/packages/information.json
+++ b/settings/v2/packages/information.json
@@ -7,7 +7,7 @@
       "enable": true,
       "customSplash": {
         "complete": true,
-        "form": "https://creator-api.cocos.com/api/form/show?sid=ec6b43bddfc8957bdecb688b13a99021"
+        "form": "https://creator-api.cocos.com/api/form/show?sid=ee5002d3a748aae1e43db5c9cbeb0f5f"
       }
     },
     "removeSplash": {
@@ -16,7 +16,7 @@
       "enable": true,
       "removeSplash": {
         "complete": true,
-        "form": "https://creator-api.cocos.com/api/form/show?sid=ec6b43bddfc8957bdecb688b13a99021"
+        "form": "https://creator-api.cocos.com/api/form/show?sid=ee5002d3a748aae1e43db5c9cbeb0f5f"
       }
     }
   }