diff --git a/assets/resources/game/heros/a3.prefab b/assets/resources/game/heros/a3.prefab
index 13769fbd..f90a754c 100644
--- a/assets/resources/game/heros/a3.prefab
+++ b/assets/resources/game/heros/a3.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 95
+      },
+      {
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1498,6 +1501,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "12/JRUQxNOb4XyRugfdK75"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "0eI7xnuipJJJ8/kJ+t51l4"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/a4.prefab b/assets/resources/game/heros/a4.prefab
index a453e26b..abbf262e 100644
--- a/assets/resources/game/heros/a4.prefab
+++ b/assets/resources/game/heros/a4.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 95
+      },
+      {
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1498,6 +1501,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "a2jPQ8TNhPj67IyZiPimbD"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a0ZuO8pcZBVLCGR/YlgT1g"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/a5.prefab b/assets/resources/game/heros/a5.prefab
index 06e30871..9b0f27e8 100644
--- a/assets/resources/game/heros/a5.prefab
+++ b/assets/resources/game/heros/a5.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 95
+      },
+      {
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1498,6 +1501,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "bcLqUE0OFGNrOQ237vM07E"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "67tfoudqpBOa0qtG74B8C1"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/d1.prefab b/assets/resources/game/heros/d1.prefab
index 39a06d61..2fedcccd 100644
--- a/assets/resources/game/heros/d1.prefab
+++ b/assets/resources/game/heros/d1.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 96
+      },
+      {
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 100
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1511,6 +1514,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "73tF4dlnxPwrg/FRKx1Opn"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 99
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e04gcKnRVFqIEPoK8xjNF5"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/d2.prefab b/assets/resources/game/heros/d2.prefab
index 471acddb..9206dfe0 100644
--- a/assets/resources/game/heros/d2.prefab
+++ b/assets/resources/game/heros/d2.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 96
+      },
+      {
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 100
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1511,6 +1514,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "01hrg2GRpPOIe0UPL1K3+9"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 99
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "49gQPhPXRGGIE6FPJixjy0"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/k1.prefab b/assets/resources/game/heros/k1.prefab
index 7395765b..a05ede4c 100644
--- a/assets/resources/game/heros/k1.prefab
+++ b/assets/resources/game/heros/k1.prefab
@@ -65,10 +65,13 @@
       },
       {
         "__id__": 87
+      },
+      {
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 91
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1383,6 +1386,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "4cocBoZPBGhph8DyWbZwSS"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 90
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "08J9V80+JMALiSGlvM4eOE"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/k2.prefab b/assets/resources/game/heros/k2.prefab
index cc3317c0..b7a4c3e3 100644
--- a/assets/resources/game/heros/k2.prefab
+++ b/assets/resources/game/heros/k2.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 95
+      },
+      {
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1498,6 +1501,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "22rQh8lkpINoemMMMjGXPA"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d7mGZQWT5Ke7Pn6FHiBfvi"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/k3.prefab b/assets/resources/game/heros/k3.prefab
index c0d39ce6..a1303d05 100644
--- a/assets/resources/game/heros/k3.prefab
+++ b/assets/resources/game/heros/k3.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 95
+      },
+      {
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1498,6 +1501,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "22rQh8lkpINoemMMMjGXPA"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5bxB76k5BGoLoztZDZc06R"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/k4.prefab b/assets/resources/game/heros/k4.prefab
index f7122e17..3141e10a 100644
--- a/assets/resources/game/heros/k4.prefab
+++ b/assets/resources/game/heros/k4.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 95
+      },
+      {
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1498,6 +1501,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "22rQh8lkpINoemMMMjGXPA"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "dflWZRVv9BhIkcpqreLeRl"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/k5.prefab b/assets/resources/game/heros/k5.prefab
index 2c9b748c..225cede1 100644
--- a/assets/resources/game/heros/k5.prefab
+++ b/assets/resources/game/heros/k5.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1530,6 +1533,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "f2f7ZpftZN5ats6jdhFfCm"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 101
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f2GtSvgCtHAYJc+VDNYBt4"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/zh1.prefab b/assets/resources/game/heros/zh1.prefab
index 042215b7..4b01ca05 100644
--- a/assets/resources/game/heros/zh1.prefab
+++ b/assets/resources/game/heros/zh1.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1530,6 +1533,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "24NMIe4OBIpbwx1nh6NYWa"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 101
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c0QpxHu2ZIF4SuX4gcAwdM"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/resources/game/heros/zh2.prefab b/assets/resources/game/heros/zh2.prefab
index 64b85284..384ccdba 100644
--- a/assets/resources/game/heros/zh2.prefab
+++ b/assets/resources/game/heros/zh2.prefab
@@ -68,10 +68,13 @@
       },
       {
         "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1530,6 +1533,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "beDt1ByHNB564mmZr4kD3H"
   },
+  {
+    "__type__": "846e0MH5V5Lw6nbs4fImtZx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 101
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "92KbMRroFOB79gD+ep0wHK"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts
index cec38d8a..7685bcf3 100644
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -4,7 +4,7 @@
 
 import { getHeroList, HeroList } from "./heroSet"
 import { getSkills, HeroSkillList, SkillSet } from "./SkillSet"
-import { equip_list, weapons, armors, accessorys, getEquipUUIDsByTypeAndLevel } from "./Equips"
+import { equip_list, weapons, armors, accessorys, getEquipUUIDsByType } from "./Equips"
 import { getEnhancement } from "./LevelUp"
 
 //1:伙伴 2:技能 3:装备的出现概率配置
@@ -116,7 +116,7 @@ export function getRandomCardsByType(
             break;
         case cardType.EQUIP:
             // 根据装备子类型筛选
-            cardList=getEquipUUIDsByTypeAndLevel(data,level) //装备时 data是装备子类型 1:武器 2:防具 3:饰品 0或undefined:全部
+            cardList=getEquipUUIDsByType(data) //装备时 data是装备子类型 1:武器 2:防具 3:饰品 0或undefined:全部
             break;
         case cardType.SPECIAL:
             cardList = SuperCardsList;
diff --git a/assets/script/game/common/config/Equips.ts b/assets/script/game/common/config/Equips.ts
index eff764e7..eae69263 100644
--- a/assets/script/game/common/config/Equips.ts
+++ b/assets/script/game/common/config/Equips.ts
@@ -266,12 +266,11 @@ export const equip_list = [...swordWeapons, ...axeWeapons, ...hammerWeapons, ...
 
 
 /**
- * 根据装备类型和等级获取uuid数组
+ * 根据装备类型获取所有uuid数组
  * @param equipType 装备类型 1:武器 2:防具 3:饰品 (可选，不传则返回所有类型)
- * @param level 装备等级 (可选，不传则返回该类型所有等级)
  * @returns uuid数组
  */
-export function getEquipUUIDsByTypeAndLevel(equipType?: EquipType, level?: number): number[] {
+export function getEquipUUIDsByType(equipType?: EquipType): number[] {
     const result: number[] = [];
     
     // 遍历所有装备配置
@@ -280,15 +279,8 @@ export function getEquipUUIDsByTypeAndLevel(equipType?: EquipType, level?: numbe
         
         // 检查装备类型是否匹配（如果指定了类型）
         if (equipType === undefined || equipData.type === equipType) {
-            // 如果指定了等级，则检查等级是否匹配
-            if (level !== undefined) {
-                if (equipData.lv === level) {
-                    result.push(numericUuid);
-                }
-            } else {
-                // 如果没有指定等级，则添加所有该类型的装备
-                result.push(numericUuid);
-            }
+            // 添加所有该类型的装备
+            result.push(numericUuid);
         }
     }
     
@@ -296,48 +288,12 @@ export function getEquipUUIDsByTypeAndLevel(equipType?: EquipType, level?: numbe
     return result.sort((a, b) => a - b);
 }
 
-/**
- * 根据装备类型获取所有等级列表
- * @param equipType 装备类型 1:武器 2:防具 3:饰品 (可选，不传则返回所有类型的等级)
- * @returns 等级数组
- */
-export function getEquipLevelsByType(equipType?: EquipType): number[] {
-    const levels = new Set<number>();
-    
-    // 遍历所有装备配置
-    for (const equipData of Object.values(EquipInfo)) {
-        if (equipType === undefined || equipData.type === equipType) {
-            levels.add(equipData.lv);
-        }
-    }
-    
-    // 转换为数组并排序
-    return Array.from(levels).sort((a, b) => a - b);
-}
-
-/**
- * 根据等级获取所有装备类型的uuid数组
- * @param level 装备等级
- * @returns 按类型分组的uuid数组
- */
-export function getEquipUUIDsByLevel(level: number): {
-    weapons: number[];
-    armors: number[];
-    accessories: number[];
-} {
-    return {
-        weapons: getEquipUUIDsByTypeAndLevel(EquipType.WEAPON, level),
-        armors: getEquipUUIDsByTypeAndLevel(EquipType.ARMOR, level),
-        accessories: getEquipUUIDsByTypeAndLevel(EquipType.ACCESSORY, level),
-    };
-}
-
 /**
  * 获取所有装备的uuid数组
  * @returns 所有装备的uuid数组
  */
 export function getAllEquipUUIDs(): number[] {
-    return getEquipUUIDsByTypeAndLevel();
+    return getEquipUUIDsByType();
 }
 
 
@@ -361,7 +317,6 @@ export interface EquipData {
     name: string;              // 装备名称
     type: EquipType;           // 装备类型
     quality: Quality;          // 装备品质
-    lv: number;                // 装备等级
     path: string;              // 文件名
     info: string;              // 装备描述
     special_attr: EquipSpecialAttrData[]; // 特殊属性数组
@@ -370,238 +325,13 @@ export interface EquipData {
 }
 
 export const EquipInfo: { [key: number]: EquipData } = {
-    // 等级1 剑类武器
+   
+    // 剑类武器
     2101: {
         uuid: 2101, 
-        name: "穿刺短剑(Lv1)", 
+        name: "穿刺短剑", 
         type: EquipType.WEAPON, 
         quality: Quality.GREEN, 
-        lv: 1,
-        path: EPath["穿刺短剑"],
-        info: "攻击力增加50%，穿透1个目标",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 50, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 1, target: EquipAttrTarget.HERO }, // 穿刺1个目标
-        ],
-    },
-    2102: {
-        uuid: 2102, 
-        name: "寒锋长剑(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 1,
-        path: EPath["寒锋长剑"],
-        info: "攻击力增加70%，穿透2个目标，10%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 70, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 2, target: EquipAttrTarget.HERO }, // 穿刺2个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 10, target: EquipAttrTarget.HERO }, // 10%穿刺伤害
-        ],
-    },
-    2103: {
-        uuid: 2103, 
-        name: "龙鳞穿刺者(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 1,
-        path: EPath["龙鳞穿刺者"],
-        info: "攻击力增加95%，穿透3个目标，20%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 95, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 3, target: EquipAttrTarget.HERO }, // 穿刺3个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 20, target: EquipAttrTarget.HERO }, // 20%穿刺伤害
-        ],
-    },
-
-    // 等级2 剑类武器
-    2201: {
-        uuid: 2201, 
-        name: "穿刺短剑(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 2,
-        path: EPath["穿刺短剑"],
-        info: "攻击力增加80%，穿透1个目标",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 80, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 1, target: EquipAttrTarget.HERO }, // 穿刺1个目标
-        ],
-    },
-    2202: {
-        uuid: 2202, 
-        name: "寒锋长剑(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 2,
-        path: EPath["寒锋长剑"],
-        info: "攻击力增加110%，穿透2个目标，15%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 110, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 2, target: EquipAttrTarget.HERO }, // 穿刺2个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 15, target: EquipAttrTarget.HERO }, // 15%穿刺伤害
-        ],
-    },
-    2203: {
-        uuid: 2203, 
-        name: "龙鳞穿刺者(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 2,
-        path: EPath["龙鳞穿刺者"],
-        info: "攻击力增加140%，穿透3个目标，25%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 140, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 3, target: EquipAttrTarget.HERO }, // 穿刺3个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 25, target: EquipAttrTarget.HERO }, // 25%穿刺伤害
-        ],
-    },
-
-    // 等级3 剑类武器
-    2301: {
-        uuid: 2301, 
-        name: "穿刺短剑(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 3,
-        path: EPath["穿刺短剑"],
-        info: "攻击力增加110%，穿透1个目标",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 110, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 1, target: EquipAttrTarget.HERO }, // 穿刺1个目标
-        ],
-    },
-    2302: {
-        uuid: 2302, 
-        name: "寒锋长剑(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 3,
-        path: EPath["寒锋长剑"],
-        info: "攻击力增加150%，穿透2个目标，20%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 150, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 2, target: EquipAttrTarget.HERO }, // 穿刺2个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 20, target: EquipAttrTarget.HERO }, // 20%穿刺伤害
-        ],
-    },
-    2303: {
-        uuid: 2303, 
-        name: "龙鳞穿刺者(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 3,
-        path: EPath["龙鳞穿刺者"],
-        info: "攻击力增加185%，穿透3个目标，30%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 185, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 3, target: EquipAttrTarget.HERO }, // 穿刺3个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 30, target: EquipAttrTarget.HERO }, // 30%穿刺伤害
-        ],
-    },
-
-    // 等级4 剑类武器
-    2401: {
-        uuid: 2401, 
-        name: "穿刺短剑(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 4,
-        path: EPath["穿刺短剑"],
-        info: "攻击力增加140%，穿透1个目标",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 140, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 1, target: EquipAttrTarget.HERO }, // 穿刺1个目标
-        ],
-    },
-    2402: {
-        uuid: 2402, 
-        name: "寒锋长剑(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 4,
-        path: EPath["寒锋长剑"],
-        info: "攻击力增加190%，穿透2个目标，25%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 190, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 2, target: EquipAttrTarget.HERO }, // 穿刺2个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 25, target: EquipAttrTarget.HERO }, // 25%穿刺伤害
-        ],
-    },
-    2403: {
-        uuid: 2403, 
-        name: "龙鳞穿刺者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["龙鳞穿刺者"],
-        info: "攻击力增加240%，穿透3个目标，35%穿刺伤害",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 240, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 3, target: EquipAttrTarget.HERO }, // 穿刺3个目标
-            { type: BuffAttr.PUNCTURE_DMG, value: 35, target: EquipAttrTarget.HERO }, // 35%穿刺伤害
-        ],
-    },
-    2404: {
-        uuid: 2404, 
-        name: "冰霜穿刺者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["冰霜穿刺者"],
-        info: "攻击力增加240%，穿透3个目标，冰冻概率20%",
-        special_attr: [],
-        build: [build_list.PUNCTURE],
-        buff: [
-            { type: BuffAttr.ATK, value: 240, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 20, target: EquipAttrTarget.HERO }, // CD修正-20%
-            { type: BuffAttr.PUNCTURE, value: 3, target: EquipAttrTarget.HERO }, // 穿刺3个目标
-            { type: BuffAttr.FROST_RATIO, value: 20, target: EquipAttrTarget.HERO }, // 冰冻概率20%
-        ],
-    },
-
-    // 等级5 剑类武器
-    2501: {
-        uuid: 2501, 
-        name: "穿刺短剑(Lv5)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 5,
         path: EPath["穿刺短剑"],
         info: "攻击力增加170%，穿透1个目标",
         special_attr: [],
@@ -612,12 +342,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.PUNCTURE, value: 1, target: EquipAttrTarget.HERO }, // 穿刺1个目标
         ],
     },
-    2502: {
-        uuid: 2502, 
-        name: "寒锋长剑(Lv5)", 
+    2102: {
+        uuid: 2102, 
+        name: "寒锋长剑", 
         type: EquipType.WEAPON, 
         quality: Quality.BLUE, 
-        lv: 5,
         path: EPath["寒锋长剑"],
         info: "攻击力增加230%，穿透2个目标，30%穿刺伤害",
         special_attr: [],
@@ -629,12 +358,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.PUNCTURE_DMG, value: 30, target: EquipAttrTarget.HERO }, // 30%穿刺伤害
         ],
     },
-    2503: {
-        uuid: 2503, 
-        name: "龙鳞穿刺者(Lv5)", 
+    2103: {
+        uuid: 2103, 
+        name: "龙鳞穿刺者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["龙鳞穿刺者"],
         info: "攻击力增加290%，穿透3个目标，40%穿刺伤害",
         special_attr: [],
@@ -646,12 +374,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.PUNCTURE_DMG, value: 40, target: EquipAttrTarget.HERO }, // 40%穿刺伤害
         ],
     },
-    2504: {
-        uuid: 2504, 
-        name: "冰霜穿刺者(Lv5)", 
+    2104: {
+        uuid: 2104, 
+        name: "冰霜穿刺者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["冰霜穿刺者"],
         info: "攻击力增加290%，穿透3个目标，冰冻概率25%",
         special_attr: [],
@@ -665,232 +392,13 @@ export const EquipInfo: { [key: number]: EquipData } = {
     },
 
     // === 斧类武器配置 ===
-    
-    // 等级1 斧类武器
+   
+    // 斧类武器
     3101: {
         uuid: 3101, 
-        name: "风暴战斧(Lv1)", 
+        name: "风暴战斧", 
         type: EquipType.WEAPON, 
         quality: Quality.GREEN, 
-        lv: 1,
-        path: EPath["风暴战斧"],
-        info: "攻击力增加100%，风怒概率20%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 100, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 20, target: EquipAttrTarget.HERO }, // 风怒概率20%
-        ],
-    },
-    3102: {
-        uuid: 3102, 
-        name: "寒锋巨斧(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 1,
-        path: EPath["寒锋巨斧"],
-        info: "攻击力增加130%，风怒概率30%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 130, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 30, target: EquipAttrTarget.HERO }, // 风怒概率30%
-        ],
-    },
-    3103: {
-        uuid: 3103, 
-        name: "龙鳞撕裂者(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 1,
-        path: EPath["龙鳞撕裂者"],
-        info: "攻击力增加160%，风怒概率40%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 160, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 40, target: EquipAttrTarget.HERO }, // 风怒概率40%
-        ],
-    },
-
-    // 等级2 斧类武器
-    3201: {
-        uuid: 3201, 
-        name: "风暴战斧(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 2,
-        path: EPath["风暴战斧"],
-        info: "攻击力增加130%，风怒概率25%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 130, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 25, target: EquipAttrTarget.HERO }, // 风怒概率25%
-        ],
-    },
-    3202: {
-        uuid: 3202, 
-        name: "寒锋巨斧(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 2,
-        path: EPath["寒锋巨斧"],
-        info: "攻击力增加170%，风怒概率35%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 170, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 35, target: EquipAttrTarget.HERO }, // 风怒概率35%
-        ],
-    },
-    3203: {
-        uuid: 3203, 
-        name: "龙鳞撕裂者(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 2,
-        path: EPath["龙鳞撕裂者"],
-        info: "攻击力增加200%，风怒概率45%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 200, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 45, target: EquipAttrTarget.HERO }, // 风怒概率45%
-        ],
-    },
-
-    // 等级3 斧类武器
-    3301: {
-        uuid: 3301, 
-        name: "风暴战斧(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 3,
-        path: EPath["风暴战斧"],    
-        info: "攻击力增加160%，风怒概率30%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 160, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 30, target: EquipAttrTarget.HERO }, // 风怒概率30%
-        ],
-    },
-    3302: {
-        uuid: 3302, 
-        name: "寒锋巨斧(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 3,
-        path: EPath["寒锋巨斧"],
-        info: "攻击力增加210%，风怒概率40%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 210, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 40, target: EquipAttrTarget.HERO }, // 风怒概率40%
-        ],
-    },
-    3303: {
-        uuid: 3303, 
-        name: "龙鳞撕裂者(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 3,
-        path: EPath["龙鳞撕裂者"],
-        info: "攻击力增加240%，风怒概率50%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 240, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 50, target: EquipAttrTarget.HERO }, // 风怒概率50%
-        ],
-    },
-
-    // 等级4 斧类武器
-    3401: {
-        uuid: 3401, 
-        name: "风暴战斧(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 4,
-        path: EPath["风暴战斧"],
-        info: "攻击力增加190%，风怒概率35%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 190, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 35, target: EquipAttrTarget.HERO }, // 风怒概率35%
-        ],
-    },
-    3402: {
-        uuid: 3402, 
-        name: "寒锋巨斧(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 4,
-        path: EPath["寒锋巨斧"],
-        info: "攻击力增加250%，风怒概率45%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 250, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 45, target: EquipAttrTarget.HERO }, // 风怒概率45%
-        ],
-    },
-    3403: {
-        uuid: 3403, 
-        name: "龙鳞撕裂者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["龙鳞撕裂者"],
-        info: "攻击力增加280%，风怒概率75%，击退概率24%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 280, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 75, target: EquipAttrTarget.HERO }, // 风怒概率75%
-            { type: BuffAttr.KNOCKBACK, value: 24, target: EquipAttrTarget.HERO }, // 击退概率34%
-        ],
-    },
-    3404: {
-        uuid: 3404, 
-        name: "泰坦撕裂者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["泰坦撕裂者"],
-        info: "攻击力增加200%，风怒概率75%，击晕概率10%",
-        special_attr: [],
-        build: [build_list.WFUNY],
-        buff: [
-            { type: BuffAttr.ATK, value: 200, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0%
-            { type: BuffAttr.WFUNY, value: 75, target: EquipAttrTarget.HERO }, // 风怒概率75%
-            { type: BuffAttr.STUN_RATTO, value: 10, target: EquipAttrTarget.HERO }, // 击晕概率10%
-        ],
-    },
-
-    // 等级5 斧类武器
-    3501: {
-        uuid: 3501, 
-        name: "风暴战斧(Lv5)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 5,
         path: EPath["风暴战斧"],
         info: "攻击力增加220%，风怒概率40%",
         special_attr: [],
@@ -901,12 +409,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.WFUNY, value: 40, target: EquipAttrTarget.HERO }, // 风怒概率40%
         ],
     },
-    3502: {
-        uuid: 3502, 
-        name: "寒锋巨斧(Lv5)", 
+    3102: {
+        uuid: 3102, 
+        name: "寒锋巨斧", 
         type: EquipType.WEAPON, 
         quality: Quality.BLUE, 
-        lv: 5,
         path: EPath["寒锋巨斧"],
         info: "攻击力增加280%，风怒概率50%",
         special_attr: [],
@@ -917,12 +424,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.WFUNY, value: 50, target: EquipAttrTarget.HERO }, // 风怒概率50%
         ],
     },
-    3503: {
-        uuid: 3503, 
-        name: "龙鳞撕裂者(Lv5)", 
+    3105: {
+        uuid: 3105, 
+        name: "龙鳞撕裂者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["龙鳞撕裂者"],
         info: "攻击力增加340%，风怒概率60%，击退概率27%",
         special_attr: [],
@@ -934,12 +440,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.KNOCKBACK, value: 27, target: EquipAttrTarget.HERO }, // 击退概率37%
         ],
     },
-    3504: {
-        uuid: 3504, 
-        name: "泰坦撕裂者(Lv5)", 
+    3106: {
+        uuid: 3106, 
+        name: "泰坦撕裂者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["泰坦撕裂者"],
         info: "攻击力增加300%，风怒概率60%，击晕概率12.5%",
         special_attr: [],
@@ -954,242 +459,13 @@ export const EquipInfo: { [key: number]: EquipData } = {
 
     // === 锤类武器配置 ===
     
-    // 等级1 锤类武器
-    1101: {
-        uuid: 1101, 
-        name: "碎骨战锤(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 1,
-        path: EPath["碎骨战锤"],
-        info: "攻击力增加120%，暴击率10%，暴击伤害+25%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 120, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 10, target: EquipAttrTarget.HERO }, // 暴击率10%
-            { type: BuffAttr.CRITICAL_DMG, value: 25, target: EquipAttrTarget.HERO }, // 暴击伤害+25%
-        ],
-    },
-    1102: {
-        uuid: 1102, 
-        name: "雷霆重锤(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 1,
-        path: EPath["雷霆重锤"],
-        info: "攻击力增加150%，暴击率15%，暴击伤害+35%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 150, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 15, target: EquipAttrTarget.HERO }, // 暴击率15%
-            { type: BuffAttr.CRITICAL_DMG, value: 35, target: EquipAttrTarget.HERO }, // 暴击伤害+35%
-        ],
-    },
-    1103: {
-        uuid: 1103, 
-        name: "龙鳞粉碎者(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 1,
-        path: EPath["龙鳞粉碎者"],
-        info: "攻击力增加180%，暴击率20%，暴击伤害+50%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 180, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 20, target: EquipAttrTarget.HERO }, // 暴击率20%
-            { type: BuffAttr.CRITICAL_DMG, value: 50, target: EquipAttrTarget.HERO }, // 暴击伤害+50%
-        ],
-    },
 
-    // 等级2 锤类武器
-    1201: {
-        uuid: 1201, 
-        name: "碎骨战锤(Lv2)", 
+    // 锤类武器
+    5101: {
+        uuid: 5101, 
+        name: "碎骨战锤", 
         type: EquipType.WEAPON, 
         quality: Quality.GREEN, 
-        lv: 2,
-        path: EPath["碎骨战锤"],
-        info: "攻击力增加150%，暴击率10%，暴击伤害+30%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 150, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 10, target: EquipAttrTarget.HERO }, // 暴击率10%
-            { type: BuffAttr.CRITICAL_DMG, value: 30, target: EquipAttrTarget.HERO }, // 暴击伤害+30%
-        ],
-    },
-    1202: {
-        uuid: 1202, 
-        name: "雷霆重锤(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 2,
-        path: EPath["雷霆重锤"],
-        info: "攻击力增加190%，暴击率20%，暴击伤害+40%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 190, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 20, target: EquipAttrTarget.HERO }, // 暴击率20%
-            { type: BuffAttr.CRITICAL_DMG, value: 40, target: EquipAttrTarget.HERO }, // 暴击伤害+40%
-        ],
-    },
-    1203: {
-        uuid: 1203, 
-        name: "龙鳞粉碎者(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 2,
-        path: EPath["龙鳞粉碎者"],
-        info: "攻击力增加220%，暴击率25%，暴击伤害+55%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 220, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 25, target: EquipAttrTarget.HERO }, // 暴击率25%
-            { type: BuffAttr.CRITICAL_DMG, value: 55, target: EquipAttrTarget.HERO }, // 暴击伤害+55%
-        ],
-    },
-
-    // 等级3 锤类武器
-    1301: {
-        uuid: 1301, 
-        name: "碎骨战锤(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 3,
-        path: EPath["碎骨战锤"],
-        info: "攻击力增加180%，暴击率15%，暴击伤害+30%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 180, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 15, target: EquipAttrTarget.HERO }, // 暴击率15%
-            { type: BuffAttr.CRITICAL_DMG, value: 30, target: EquipAttrTarget.HERO }, // 暴击伤害+30%
-        ],
-    },
-    1302: {
-        uuid: 1302, 
-        name: "雷霆重锤(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 3,
-        path: EPath["雷霆重锤"],
-        info: "攻击力增加230%，暴击率20%，暴击伤害+40%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 230, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 20, target: EquipAttrTarget.HERO }, // 暴击率20%
-            { type: BuffAttr.CRITICAL_DMG, value: 40, target: EquipAttrTarget.HERO }, // 暴击伤害+40%
-        ],
-    },
-    1303: {
-        uuid: 1303, 
-        name: "龙鳞粉碎者(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 3,
-        path: EPath["龙鳞粉碎者"],
-        info: "攻击力增加260%，暴击率25%，暴击伤害+60%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 260, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 25, target: EquipAttrTarget.HERO }, // 暴击率25%
-            { type: BuffAttr.CRITICAL_DMG, value: 60, target: EquipAttrTarget.HERO }, // 暴击伤害+60%
-        ],
-    },
-
-    // 等级4 锤类武器
-    1401: {
-        uuid: 1401, 
-        name: "碎骨战锤(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 4,
-        path: EPath["碎骨战锤"],
-        info: "攻击力增加210%，暴击率15%，暴击伤害+35%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 210, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 15, target: EquipAttrTarget.HERO }, // 暴击率15%
-            { type: BuffAttr.CRITICAL_DMG, value: 35, target: EquipAttrTarget.HERO }, // 暴击伤害+35%
-        ],
-    },
-    1402: {
-        uuid: 1402, 
-        name: "雷霆重锤(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 4,
-        path: EPath["雷霆重锤"],
-        info: "攻击力增加270%，暴击率25%，暴击伤害+45%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 270, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 25, target: EquipAttrTarget.HERO }, // 暴击率25%
-            { type: BuffAttr.CRITICAL_DMG, value: 45, target: EquipAttrTarget.HERO }, // 暴击伤害+45%
-        ],
-    },
-    1403: {
-        uuid: 1403, 
-        name: "龙鳞粉碎者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["龙鳞粉碎者"],
-        info: "攻击力增加300%，暴击率30%，暴击伤害+65%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 300, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 30, target: EquipAttrTarget.HERO }, // 暴击率30%
-            { type: BuffAttr.CRITICAL_DMG, value: 65, target: EquipAttrTarget.HERO }, // 暴击伤害+65%
-        ],
-    },
-    1404: {
-        uuid: 1404, 
-        name: "泰坦粉碎者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["泰坦粉碎者"],
-        info: "攻击力增加300%，暴击率30%，击晕概率25%",
-        special_attr: [],
-        build: [build_list.CRIT],
-        buff: [
-            { type: BuffAttr.ATK, value: 300, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: -6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7%
-            { type: BuffAttr.CRITICAL, value: 30, target: EquipAttrTarget.HERO }, // 暴击率30%
-            { type: BuffAttr.STUN_RATTO, value: 25, target: EquipAttrTarget.HERO }, // 击晕概率25%
-        ],
-    },
-
-    // 等级5 锤类武器
-    1501: {
-        uuid: 1501, 
-        name: "碎骨战锤(Lv5)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 5,
         path: EPath["碎骨战锤"],
         info: "攻击力增加240%，暴击率20%，暴击伤害+35%",
         special_attr: [],
@@ -1201,12 +477,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.CRITICAL_DMG, value: 35, target: EquipAttrTarget.HERO }, // 暴击伤害+35%
         ],
     },
-    1502: {
-        uuid: 1502, 
-        name: "雷霆重锤(Lv5)", 
+    5102: {
+        uuid: 5102, 
+        name: "雷霆重锤", 
         type: EquipType.WEAPON, 
         quality: Quality.BLUE, 
-        lv: 5,
         path: EPath["雷霆重锤"],
         info: "攻击力增加310%，暴击率25%，暴击伤害+45%",
         special_attr: [],
@@ -1218,12 +493,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.CRITICAL_DMG, value: 45, target: EquipAttrTarget.HERO }, // 暴击伤害+45%
         ],
     },
-    1503: {
-        uuid: 1503, 
-        name: "龙鳞粉碎者(Lv5)", 
+    5103: {
+        uuid: 5103, 
+        name: "龙鳞粉碎者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["龙鳞粉碎者"],
         info: "攻击力增加360%，暴击率30%，暴击伤害+70%,击晕概率+15%",
         special_attr: [],
@@ -1236,12 +510,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.STUN_RATTO, value: 15, target: EquipAttrTarget.HERO }, // 击晕概率+15%
         ],
     },
-    1504: {
-        uuid: 1504, 
-        name: "泰坦粉碎者(Lv5)", 
+    5104: {
+        uuid: 5104, 
+        name: "泰坦粉碎者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["泰坦粉碎者"],
         info: "攻击力增加360%，暴击率30%，击晕概率30%",
         special_attr: [],
@@ -1256,231 +529,13 @@ export const EquipInfo: { [key: number]: EquipData } = {
 
     // === 刀类武器配置 ===
     
-    // 等级1 刀类武器
+  
+    // 刀类武器
     6101: {
         uuid: 6101, 
-        name: "影刃(Lv1)", 
+        name: "影刃", 
         type: EquipType.WEAPON, 
         quality: Quality.GREEN, 
-        lv: 1,
-        path: EPath["影刃"],
-        info: "攻击力增加60%，攻击施加易伤(15%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 60, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 15, target: EquipAttrTarget.HERO }, // 攻击施加易伤(15%)
-        ],
-    },
-    6102: {
-        uuid: 6102, 
-        name: "寒月双刃(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 1,
-        path: EPath["寒月双刃"],
-        info: "攻击力增加85%，攻击施加易伤(20%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 85, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 20, target: EquipAttrTarget.HERO }, // 攻击施加易伤(20%)
-        ],
-    },
-    6103: {
-        uuid: 6103, 
-        name: "龙鳞切割者(Lv1)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 1,
-        path: EPath["龙鳞切割者"],
-        info: "攻击力增加115%，攻击施加易伤(25%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 115, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 25, target: EquipAttrTarget.HERO }, // 攻击施加易伤(25%)
-        ],
-    },
-
-    // 等级2 刀类武器
-    6201: {
-        uuid: 6201, 
-        name: "影刃(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 2,
-        path: EPath["影刃"],
-        info: "攻击力增加90%，攻击施加易伤(15%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 90, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 15, target: EquipAttrTarget.HERO }, // 攻击施加易伤(15%)
-        ],
-    },
-    6202: {
-        uuid: 6202, 
-        name: "寒月双刃(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 2,
-        path: EPath["寒月双刃"],
-        info: "攻击力增加125%，攻击施加易伤(25%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 125, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 25, target: EquipAttrTarget.HERO }, // 攻击施加易伤(25%)
-        ],
-    },
-    6203: {
-        uuid: 6203, 
-        name: "龙鳞切割者(Lv2)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 2,
-        path: EPath["龙鳞切割者"],
-        info: "攻击力增加160%，攻击施加易伤(30%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 160, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 30, target: EquipAttrTarget.HERO }, // 攻击施加易伤(30%)
-        ],
-    },
-
-    // 等级3 刀类武器
-    6301: {
-        uuid: 6301, 
-        name: "影刃(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 3,
-        path: EPath["影刃"],
-        info: "攻击力增加120%，攻击施加易伤(20%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 120, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 20, target: EquipAttrTarget.HERO }, // 攻击施加易伤(20%)
-        ],
-    },
-    6302: {
-        uuid: 6302, 
-        name: "寒月双刃(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 3,
-        path: EPath["寒月双刃"],
-        info: "攻击力增加165%，攻击施加易伤(25%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 165, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 25, target: EquipAttrTarget.HERO }, // 攻击施加易伤(25%)
-        ],
-    },
-    6303: {
-        uuid: 6303, 
-        name: "龙鳞切割者(Lv3)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 3,
-        path: EPath["龙鳞切割者"],
-        info: "攻击力增加205%，攻击施加易伤(35%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 205, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 35, target: EquipAttrTarget.HERO }, // 攻击施加易伤(35%)
-        ],
-    },
-
-    // 等级4 刀类武器
-    6401: {
-        uuid: 6401, 
-        name: "影刃(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 4,
-        path: EPath["影刃"],
-        info: "攻击力增加150%，攻击施加易伤(20%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 150, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 20, target: EquipAttrTarget.HERO }, // 攻击施加易伤(20%)
-        ],
-    },
-    6402: {
-        uuid: 6402, 
-        name: "寒月双刃(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.BLUE, 
-        lv: 4,
-        path: EPath["寒月双刃"],
-        info: "攻击力增加205%，攻击施加易伤(30%)",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 205, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 30, target: EquipAttrTarget.HERO }, // 攻击施加易伤(30%)
-        ],
-    },
-    6403: {
-        uuid: 6403, 
-        name: "龙鳞切割者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["龙鳞切割者"],
-        info: "攻击力增加250%，攻击施加易伤(35%)，易伤持续次数+1",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 250, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 35, target: EquipAttrTarget.HERO }, // 攻击施加易伤(35%)
-            { type: BuffAttr.BURN_COUNT, value: 1, target: EquipAttrTarget.HERO }, // 易伤持续次数+1
-        ],
-    },
-    6404: {
-        uuid: 6404, 
-        name: "冰霜切割者(Lv4)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["冰霜切割者"],
-        info: "攻击力增加250%，攻击施加易伤(35%)，冰冻概率20%",
-        special_attr: [],
-        build: [build_list.BURN],
-        buff: [
-            { type: BuffAttr.ATK, value: 250, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK_CD, value: 26.7, target: EquipAttrTarget.HERO }, // CD修正-26.7%
-            { type: BuffAttr.BURN_VALUE, value: 35, target: EquipAttrTarget.HERO }, // 攻击施加易伤(35%)
-            { type: BuffAttr.FROST_RATIO, value: 20, target: EquipAttrTarget.HERO }, // 冰冻概率20%
-        ],
-    },
-
-    // 等级5 刀类武器
-    6501: {
-        uuid: 6501, 
-        name: "影刃(Lv5)", 
-        type: EquipType.WEAPON, 
-        quality: Quality.GREEN, 
-        lv: 5,
         path: EPath["影刃"],
         info: "攻击力增加180%，攻击施加易伤(25%)",
         special_attr: [],
@@ -1491,12 +546,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.BURN_VALUE, value: 25, target: EquipAttrTarget.HERO }, // 攻击施加易伤(25%)
         ],
     },
-    6502: {
-        uuid: 6502, 
-        name: "寒月双刃(Lv5)", 
+    6102: {
+        uuid: 6102, 
+        name: "寒月双刃", 
         type: EquipType.WEAPON, 
         quality: Quality.BLUE, 
-        lv: 5,
         path: EPath["寒月双刃"],
         info: "攻击力增加245%，攻击施加易伤(35%)",
         special_attr: [],
@@ -1507,12 +561,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.BURN_VALUE, value: 35, target: EquipAttrTarget.HERO }, // 攻击施加易伤(35%)
         ],
     },
-    6503: {
-        uuid: 6503, 
-        name: "龙鳞切割者(Lv5)", 
+    6103: {
+        uuid: 6103, 
+        name: "龙鳞切割者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["龙鳞切割者"],
         info: "攻击力增加300%，攻击施加易伤(45%)，易伤持续次数+1",
         special_attr: [],
@@ -1524,12 +577,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.BURN_COUNT, value: 1, target: EquipAttrTarget.HERO }, // 易伤持续次数+1
         ],
     },
-    6504: {
-        uuid: 6504, 
-        name: "冰霜切割者(Lv5)", 
+    6104: {
+        uuid: 6104, 
+        name: "冰霜切割者", 
         type: EquipType.WEAPON, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["冰霜切割者"],
         info: "攻击力增加300%，攻击施加易伤(45%)，冰冻概率25%",
         special_attr: [],
@@ -1546,197 +598,13 @@ export const EquipInfo: { [key: number]: EquipData } = {
     
     // === 闪避型盾牌 ===
     
-    // 等级1 闪避型盾牌
+   
+    // 闪避型盾牌
     4101: {
         uuid: 4101, 
-        name: "风影圆盾(Lv1)", 
+        name: "风影圆盾", 
         type: EquipType.ARMOR, 
         quality: Quality.GREEN, 
-        lv: 1,
-        path: EPath["风影圆盾"],
-        info: "生命值+20%，闪避25%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 20, target: EquipAttrTarget.HERO }, // HP+20%
-            { type: BuffAttr.DODGE, value: 25, target: EquipAttrTarget.HERO }, // 闪避25%
-        ],
-    },
-    4102: {
-        uuid: 4102, 
-        name: "流光护盾(Lv1)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 1,
-        path: EPath["流光护盾"],
-        info: "生命值+25%，闪避30%，Debuff减免10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 25, target: EquipAttrTarget.HERO }, // HP+25%
-            { type: BuffAttr.DODGE, value: 30, target: EquipAttrTarget.HERO }, // 闪避30%
-            { type: BuffAttr.DEBUFF_DOWN, value: 10, target: EquipAttrTarget.HERO }, // Debuff减免10%
-        ],
-    },
-    4103: {
-        uuid: 4103, 
-        name: "量子闪避者(Lv1)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 1,
-        path: EPath["量子闪避者"],
-        info: "生命值+30%，闪避30%，免伤5%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 30, target: EquipAttrTarget.HERO }, // HP+30%
-            { type: BuffAttr.DODGE, value: 30, target: EquipAttrTarget.HERO }, // 闪避30%
-            { type: BuffAttr.DEF, value: 5, target: EquipAttrTarget.HERO }, // 免伤5%
-        ],
-    },
-
-    // 等级2 闪避型盾牌
-    4201: {
-        uuid: 4201, 
-        name: "风影圆盾(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 2,
-        path: EPath["风影圆盾"],
-        info: "生命值+25%，闪避30%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 25, target: EquipAttrTarget.HERO }, // HP+25%
-            { type: BuffAttr.DODGE, value: 30, target: EquipAttrTarget.HERO }, // 闪避30%
-        ],
-    },
-    4202: {
-        uuid: 4202, 
-        name: "流光护盾(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 2,
-        path: EPath["流光护盾"],
-        info: "生命值+30%，闪避35%，Debuff减免10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 30, target: EquipAttrTarget.HERO }, // HP+30%
-            { type: BuffAttr.DODGE, value: 35, target: EquipAttrTarget.HERO }, // 闪避35%
-            { type: BuffAttr.DEBUFF_DOWN, value: 10, target: EquipAttrTarget.HERO }, // Debuff减免10%
-        ],
-    },
-    4203: {
-        uuid: 4203, 
-        name: "量子闪避者(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 2,
-        path: EPath["量子闪避者"],
-        info: "生命值+35%，闪避35%，免伤5%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 35, target: EquipAttrTarget.HERO }, // HP+35%
-            { type: BuffAttr.DODGE, value: 35, target: EquipAttrTarget.HERO }, // 闪避35%
-            { type: BuffAttr.DEF, value: 5, target: EquipAttrTarget.HERO }, // 免伤5%
-        ],
-    },
-
-    // 等级3 闪避型盾牌
-    4301: {
-        uuid: 4301, 
-        name: "风影圆盾(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 3,
-        path: EPath["风影圆盾"],
-        info: "生命值+30%，闪避35%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 30, target: EquipAttrTarget.HERO }, // HP+30%
-            { type: BuffAttr.DODGE, value: 35, target: EquipAttrTarget.HERO }, // 闪避35%
-        ],
-    },
-    4302: {
-        uuid: 4302, 
-        name: "流光护盾(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 3,
-        path: EPath["流光护盾"],
-        info: "生命值+35%，闪避35%，Debuff减免10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 35, target: EquipAttrTarget.HERO }, // HP+35%
-            { type: BuffAttr.DODGE, value: 35, target: EquipAttrTarget.HERO }, // 闪避35%
-            { type: BuffAttr.DEBUFF_DOWN, value: 10, target: EquipAttrTarget.HERO }, // Debuff减免10%
-        ],
-    },
-    4303: {
-        uuid: 4303, 
-        name: "量子闪避者(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 3,
-        path: EPath["量子闪避者"],
-        info: "生命值+40%，闪避40%，免伤10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 40, target: EquipAttrTarget.HERO }, // HP+40%
-            { type: BuffAttr.DODGE, value: 40, target: EquipAttrTarget.HERO }, // 闪避40%
-            { type: BuffAttr.DEF, value: 10, target: EquipAttrTarget.HERO }, // 免伤10%
-        ],
-    },
-
-    // 等级4 闪避型盾牌
-    4401: {
-        uuid: 4401, 
-        name: "风影圆盾(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 4,
-        path: EPath["风影圆盾"],
-        info: "生命值+35%，闪避35%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 35, target: EquipAttrTarget.HERO }, // HP+35%
-            { type: BuffAttr.DODGE, value: 35, target: EquipAttrTarget.HERO }, // 闪避35%
-        ],
-    },
-    4402: {
-        uuid: 4402, 
-        name: "流光护盾(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 4,
-        path: EPath["流光护盾"],
-        info: "生命值+40%，闪避40%，Debuff减免15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 40, target: EquipAttrTarget.HERO }, // HP+40%
-            { type: BuffAttr.DODGE, value: 40, target: EquipAttrTarget.HERO }, // 闪避40%
-            { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
-        ],
-    },
-    4403: {
-        uuid: 4403, 
-        name: "量子闪避者(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["量子闪避者"],
-        info: "生命值+45%，闪避40%，免伤10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 45, target: EquipAttrTarget.HERO }, // HP+45%
-            { type: BuffAttr.DODGE, value: 40, target: EquipAttrTarget.HERO }, // 闪避40%
-            { type: BuffAttr.DEF, value: 10, target: EquipAttrTarget.HERO }, // 免伤10%
-        ],
-    },
-
-    // 等级5 闪避型盾牌
-    4501: {
-        uuid: 4501, 
-        name: "风影圆盾(Lv5)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 5,
         path: EPath["风影圆盾"],
         info: "生命值+40%，闪避40%",
         special_attr: [],
@@ -1745,12 +613,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.DODGE, value: 40, target: EquipAttrTarget.HERO }, // 闪避40%
         ],
     },
-    4502: {
-        uuid: 4502, 
-        name: "流光护盾(Lv5)", 
+    4102: {
+        uuid: 4102, 
+        name: "流光护盾", 
         type: EquipType.ARMOR, 
         quality: Quality.BLUE, 
-        lv: 5,
         path: EPath["流光护盾"],
         info: "生命值+45%，闪避40%，Debuff减免15%",
         special_attr: [],
@@ -1760,12 +627,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
         ],
     },
-    4503: {
-        uuid: 4503, 
-        name: "量子闪避者(Lv5)", 
+    4103: {
+        uuid: 4103, 
+        name: "量子闪避者", 
         type: EquipType.ARMOR, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["量子闪避者"],
         info: "生命值+50%，闪避45%，免伤15%",
         special_attr: [],
@@ -1778,197 +644,13 @@ export const EquipInfo: { [key: number]: EquipData } = {
 
     // === 反伤型盾牌 ===
     
-    // 等级1 反伤型盾牌
+
+    // 反伤型盾牌
     4111: {
         uuid: 4111, 
-        name: "荆棘木盾(Lv1)", 
+        name: "荆棘木盾", 
         type: EquipType.ARMOR, 
         quality: Quality.GREEN, 
-        lv: 1,
-        path: EPath["荆棘木盾"],
-        info: "生命值+60%，反伤15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 60, target: EquipAttrTarget.HERO }, // HP+60%
-            { type: BuffAttr.REFLECT, value: 15, target: EquipAttrTarget.HERO }, // 反伤15%
-        ],
-    },
-    4112: {
-        uuid: 4112, 
-        name: "钢铁尖刺(Lv1)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 1,
-        path: EPath["钢铁尖刺"],
-        info: "生命值+70%，反伤20%，Debuff减免10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 70, target: EquipAttrTarget.HERO }, // HP+70%
-            { type: BuffAttr.REFLECT, value: 20, target: EquipAttrTarget.HERO }, // 反伤20%
-            { type: BuffAttr.DEBUFF_DOWN, value: 10, target: EquipAttrTarget.HERO }, // Debuff减免10%
-        ],
-    },
-    4113: {
-        uuid: 4113, 
-        name: "龙鳞反伤者(Lv1)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 1,
-        path: EPath["龙鳞反伤者"],
-        info: "生命值+75%，反伤25%，免伤5%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 75, target: EquipAttrTarget.HERO }, // HP+75%
-            { type: BuffAttr.REFLECT, value: 25, target: EquipAttrTarget.HERO }, // 反伤25%
-            { type: BuffAttr.DEF, value: 5, target: EquipAttrTarget.HERO }, // 免伤5%
-        ],
-    },
-
-    // 等级2 反伤型盾牌
-    4211: {
-        uuid: 4211, 
-        name: "荆棘木盾(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 2,
-        path: EPath["荆棘木盾"],
-        info: "生命值+70%，反伤20%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 70, target: EquipAttrTarget.HERO }, // HP+70%
-            { type: BuffAttr.REFLECT, value: 20, target: EquipAttrTarget.HERO }, // 反伤20%
-        ],
-    },
-    4212: {
-        uuid: 4212, 
-        name: "钢铁尖刺(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 2,
-        path: EPath["钢铁尖刺"],
-        info: "生命值+75%，反伤25%，Debuff减免10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 75, target: EquipAttrTarget.HERO }, // HP+75%
-            { type: BuffAttr.REFLECT, value: 25, target: EquipAttrTarget.HERO }, // 反伤25%
-            { type: BuffAttr.DEBUFF_DOWN, value: 10, target: EquipAttrTarget.HERO }, // Debuff减免10%
-        ],
-    },
-    4213: {
-        uuid: 4213, 
-        name: "龙鳞反伤者(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 2,
-        path: EPath["龙鳞反伤者"],
-        info: "生命值+80%，反伤25%，免伤10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 80, target: EquipAttrTarget.HERO }, // HP+80%
-            { type: BuffAttr.REFLECT, value: 25, target: EquipAttrTarget.HERO }, // 反伤25%
-            { type: BuffAttr.DEF, value: 10, target: EquipAttrTarget.HERO }, // 免伤10%
-        ],
-    },
-
-    // 等级3 反伤型盾牌
-    4311: {
-        uuid: 4311, 
-        name: "荆棘木盾(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 3,
-        path: EPath["荆棘木盾"],
-        info: "生命值+75%，反伤25%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 75, target: EquipAttrTarget.HERO }, // HP+75%
-            { type: BuffAttr.REFLECT, value: 25, target: EquipAttrTarget.HERO }, // 反伤25%
-        ],
-    },
-    4312: {
-        uuid: 4312, 
-        name: "钢铁尖刺(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 3,
-        path: EPath["钢铁尖刺"],
-        info: "生命值+80%，反伤25%，Debuff减免15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 80, target: EquipAttrTarget.HERO }, // HP+80%
-            { type: BuffAttr.REFLECT, value: 25, target: EquipAttrTarget.HERO }, // 反伤25%
-            { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
-        ],
-    },
-    4313: {
-        uuid: 4313, 
-        name: "龙鳞反伤者(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 3,
-        path: EPath["龙鳞反伤者"],
-        info: "生命值+85%，反伤30%，免伤10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 85, target: EquipAttrTarget.HERO }, // HP+85%
-            { type: BuffAttr.REFLECT, value: 30, target: EquipAttrTarget.HERO }, // 反伤30%
-            { type: BuffAttr.DEF, value: 10, target: EquipAttrTarget.HERO }, // 免伤10%
-        ],
-    },
-
-    // 等级4 反伤型盾牌
-    4411: {
-        uuid: 4411, 
-        name: "荆棘木盾(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 4,
-        path: EPath["荆棘木盾"],
-        info: "生命值+80%，反伤25%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 80, target: EquipAttrTarget.HERO }, // HP+80%
-            { type: BuffAttr.REFLECT, value: 25, target: EquipAttrTarget.HERO }, // 反伤25%
-        ],
-    },
-    4412: {
-        uuid: 4412, 
-        name: "钢铁尖刺(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 4,
-        path: EPath["钢铁尖刺"],
-        info: "生命值+85%，反伤30%，Debuff减免15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 85, target: EquipAttrTarget.HERO }, // HP+85%
-            { type: BuffAttr.REFLECT, value: 30, target: EquipAttrTarget.HERO }, // 反伤30%
-            { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
-        ],
-    },
-    4413: {
-        uuid: 4413, 
-        name: "龙鳞反伤者(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["龙鳞反伤者"],
-        info: "生命值+90%，反伤30%，免伤15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 90, target: EquipAttrTarget.HERO }, // HP+90%
-            { type: BuffAttr.REFLECT, value: 30, target: EquipAttrTarget.HERO }, // 反伤30%
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, // 免伤15%
-        ],
-    },
-
-    // 等级5 反伤型盾牌
-    4511: {
-        uuid: 4511, 
-        name: "荆棘木盾(Lv5)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 5,
         path: EPath["荆棘木盾"],
         info: "生命值+85%，反伤30%",
         special_attr: [],
@@ -1977,12 +659,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.REFLECT, value: 30, target: EquipAttrTarget.HERO }, // 反伤30%
         ],
     },
-    4512: {
-        uuid: 4512, 
-        name: "钢铁尖刺(Lv5)", 
+    4112: {
+        uuid: 4112, 
+        name: "钢铁尖刺", 
         type: EquipType.ARMOR, 
         quality: Quality.BLUE, 
-        lv: 5,
         path: EPath["钢铁尖刺"],
         info: "生命值+90%，反伤30%，Debuff减免15%",
         special_attr: [],
@@ -1992,12 +673,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
         ],
     },
-    4513: {
-        uuid: 4513, 
-        name: "龙鳞反伤者(Lv5)", 
+    4113: {
+        uuid: 4113, 
+        name: "龙鳞反伤者", 
         type: EquipType.ARMOR, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["龙鳞反伤者"],
         info: "生命值+110%，反伤35%，免伤15%",
         special_attr: [],
@@ -2010,197 +690,14 @@ export const EquipInfo: { [key: number]: EquipData } = {
 
     // === 均衡型盾牌 ===
     
-    // 等级1 均衡型盾牌
+    
+
+    // 均衡型盾牌
     4121: {
         uuid: 4121, 
-        name: "守护圆盾(Lv1)", 
+        name: "守护圆盾", 
         type: EquipType.ARMOR, 
         quality: Quality.GREEN, 
-        lv: 1,
-        path: EPath["守护圆盾"],
-        info: "生命值+40%，免伤10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 40, target: EquipAttrTarget.HERO }, // HP+40%
-            { type: BuffAttr.DEF, value: 10, target: EquipAttrTarget.HERO }, // 免伤10%
-        ],
-    },
-    4122: {
-        uuid: 4122, 
-        name: "圣光壁垒(Lv1)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 1,
-        path: EPath["圣光壁垒"],
-        info: "生命值+50%，免伤10%，Debuff减免10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 50, target: EquipAttrTarget.HERO }, // HP+50%
-            { type: BuffAttr.DEF, value: 10, target: EquipAttrTarget.HERO }, // 免伤10%
-            { type: BuffAttr.DEBUFF_DOWN, value: 10, target: EquipAttrTarget.HERO }, // Debuff减免10%
-        ],
-    },
-    4123: {
-        uuid: 4123, 
-        name: "永恒守护者(Lv1)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 1,
-        path: EPath["永恒守护者"],
-        info: "生命值+55%，免伤15%，闪避5%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 55, target: EquipAttrTarget.HERO }, // HP+55%
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, // 免伤15%
-            { type: BuffAttr.DODGE, value: 5, target: EquipAttrTarget.HERO }, // 闪避5%
-        ],
-    },
-
-    // 等级2 均衡型盾牌
-    4221: {
-        uuid: 4221, 
-        name: "守护圆盾(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 2,
-        path: EPath["守护圆盾"],
-        info: "生命值+50%，免伤10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 50, target: EquipAttrTarget.HERO }, // HP+50%
-            { type: BuffAttr.DEF, value: 10, target: EquipAttrTarget.HERO }, // 免伤10%
-        ],
-    },
-    4222: {
-        uuid: 4222, 
-        name: "圣光壁垒(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 2,
-        path: EPath["圣光壁垒"],
-        info: "生命值+55%，免伤15%，Debuff减免10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 55, target: EquipAttrTarget.HERO }, // HP+55%
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, // 免伤15%
-            { type: BuffAttr.DEBUFF_DOWN, value: 10, target: EquipAttrTarget.HERO }, // Debuff减免10%
-        ],
-    },
-    4223: {
-        uuid: 4223, 
-        name: "永恒守护者(Lv2)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 2,
-        path: EPath["永恒守护者"],
-        info: "生命值+60%，免伤15%，闪避10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 60, target: EquipAttrTarget.HERO }, // HP+60%
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, // 免伤15%
-            { type: BuffAttr.DODGE, value: 10, target: EquipAttrTarget.HERO }, // 闪避10%
-        ],
-    },
-
-    // 等级3 均衡型盾牌
-    4321: {
-        uuid: 4321, 
-        name: "守护圆盾(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 3,
-        path: EPath["守护圆盾"],
-        info: "生命值+55%，免伤15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 55, target: EquipAttrTarget.HERO }, // HP+55%
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, // 免伤15%
-        ],
-    },
-    4322: {
-        uuid: 4322, 
-        name: "圣光壁垒(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 3,
-        path: EPath["圣光壁垒"],
-        info: "生命值+60%，免伤15%，Debuff减免15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 60, target: EquipAttrTarget.HERO }, // HP+60%
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, // 免伤15%
-            { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
-        ],
-    },
-    4323: {
-        uuid: 4323, 
-        name: "永恒守护者(Lv3)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 3,
-        path: EPath["永恒守护者"],
-        info: "生命值+65%，免伤20%，闪避10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 65, target: EquipAttrTarget.HERO }, // HP+65%
-            { type: BuffAttr.DEF, value: 20, target: EquipAttrTarget.HERO }, // 免伤20%
-            { type: BuffAttr.DODGE, value: 10, target: EquipAttrTarget.HERO }, // 闪避10%
-        ],
-    },
-
-    // 等级4 均衡型盾牌
-    4421: {
-        uuid: 4421, 
-        name: "守护圆盾(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 4,
-        path: EPath["守护圆盾"],
-        info: "生命值+60%，免伤15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 60, target: EquipAttrTarget.HERO }, // HP+60%
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, // 免伤15%
-        ],
-    },
-    4422: {
-        uuid: 4422, 
-        name: "圣光壁垒(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.BLUE, 
-        lv: 4,
-        path: EPath["圣光壁垒"],
-        info: "生命值+65%，免伤20%，Debuff减免15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 65, target: EquipAttrTarget.HERO }, // HP+65%
-            { type: BuffAttr.DEF, value: 20, target: EquipAttrTarget.HERO }, // 免伤20%
-            { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
-        ],
-    },
-    4423: {
-        uuid: 4423, 
-        name: "永恒守护者(Lv4)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.PURPLE, 
-        lv: 4,
-        path: EPath["永恒守护者"],
-        info: "生命值+70%，免伤20%，闪避15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 70, target: EquipAttrTarget.HERO }, // HP+70%
-            { type: BuffAttr.DEF, value: 20, target: EquipAttrTarget.HERO }, // 免伤20%
-            { type: BuffAttr.DODGE, value: 15, target: EquipAttrTarget.HERO }, // 闪避15%
-        ],
-    },
-
-    // 等级5 均衡型盾牌
-    4521: {
-        uuid: 4521, 
-        name: "守护圆盾(Lv5)", 
-        type: EquipType.ARMOR, 
-        quality: Quality.GREEN, 
-        lv: 5,
         path: EPath["守护圆盾"],
         info: "生命值+65%，免伤20%",
         special_attr: [],
@@ -2209,12 +706,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.DEF, value: 20, target: EquipAttrTarget.HERO }, // 免伤20%
         ],
     },
-    4522: {
-        uuid: 4522, 
-        name: "圣光壁垒(Lv5)", 
+    4122: {
+        uuid: 4122, 
+        name: "圣光壁垒", 
         type: EquipType.ARMOR, 
         quality: Quality.BLUE, 
-        lv: 5,
         path: EPath["圣光壁垒"],
         info: "生命值+70%，免伤20%，Debuff减免15%",
         special_attr: [],
@@ -2224,12 +720,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
             { type: BuffAttr.DEBUFF_DOWN, value: 15, target: EquipAttrTarget.HERO }, // Debuff减免15%
         ],
     },
-    4523: {
-        uuid: 4523, 
-        name: "永恒守护者(Lv5)", 
+    4123: {
+        uuid: 4123, 
+        name: "永恒守护者", 
         type: EquipType.ARMOR, 
         quality: Quality.PURPLE, 
-        lv: 5,
         path: EPath["永恒守护者"],
         info: "生命值+75%，免伤25%，闪避15%",
         special_attr: [],
@@ -2244,26 +739,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
 
     // === 绿色品质饰品 ===
     
-    // 磐石戒指
     7401: {
         uuid: 7401,
-        name: "磐石戒指(Lv4)",
+        name: "磐石戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.GREEN,
-        lv: 4,
-        path: EPath["磐石戒指"],
-        info: "生命值+55%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 55, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7501: {
-        uuid: 7501,
-        name: "磐石戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.GREEN,
-        lv: 5,
         path: EPath["磐石戒指"],
         info: "生命值+60%",
         special_attr: [],
@@ -2272,26 +752,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 刚玉戒指
     7402: {
         uuid: 7402,
-        name: "刚玉戒指(Lv4)",
+        name: "刚玉戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.GREEN,
-        lv: 4,
-        path: EPath["刚玉戒指"],
-        info: "免伤+20%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.DEF, value: 20, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7502: {
-        uuid: 7502,
-        name: "刚玉戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.GREEN,
-        lv: 5,
         path: EPath["刚玉戒指"],
         info: "免伤+25%",
         special_attr: [],
@@ -2300,26 +765,12 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 烈阳戒指
+   
     7403: {
         uuid: 7403,
-        name: "烈阳戒指(Lv4)",
+        name: "烈阳戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.GREEN,
-        lv: 4,
-        path: EPath["烈阳戒指"],
-        info: "攻击+50%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.ATK, value: 50, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7503: {
-        uuid: 7503,
-        name: "烈阳戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.GREEN,
-        lv: 5,
         path: EPath["烈阳戒指"],
         info: "攻击+55%",
         special_attr: [],
@@ -2328,26 +779,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 雷暴耳饰
     7404: {
         uuid: 7404,
-        name: "雷暴耳饰(Lv4)",
+        name: "雷暴耳饰",
         type: EquipType.ACCESSORY,
         quality: Quality.GREEN,
-        lv: 4,
-        path: EPath["雷暴耳饰"],
-        info: "暴伤+35%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.CRITICAL_DMG, value: 35, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7504: {
-        uuid: 7504,
-        name: "雷暴耳饰(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.GREEN,
-        lv: 5,
         path: EPath["雷暴耳饰"],
         info: "暴伤+40%",
         special_attr: [],
@@ -2356,26 +792,12 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 迷雾耳饰
+    
     7405: {
         uuid: 7405,
-        name: "迷雾耳饰(Lv4)",
+        name: "迷雾耳饰",
         type: EquipType.ACCESSORY,
         quality: Quality.GREEN,
-        lv: 4,
-        path: EPath["迷雾耳饰"],
-        info: "闪避+10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.DODGE, value: 10, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7505: {
-        uuid: 7505,
-        name: "迷雾耳饰(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.GREEN,
-        lv: 5,
         path: EPath["迷雾耳饰"],
         info: "闪避+15%",
         special_attr: [],
@@ -2384,26 +806,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 荆棘耳饰
     7406: {
         uuid: 7406,
-        name: "荆棘耳饰(Lv4)",
+        name: "荆棘耳饰",
         type: EquipType.ACCESSORY,
         quality: Quality.GREEN,
-        lv: 4,
-        path: EPath["荆棘耳饰"],
-        info: "反伤+15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.REFLECT, value: 15, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7506: {
-        uuid: 7506,
-        name: "荆棘耳饰(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.GREEN,
-        lv: 5,
         path: EPath["荆棘耳饰"],
         info: "反伤+20%",
         special_attr: [],
@@ -2413,28 +820,12 @@ export const EquipInfo: { [key: number]: EquipData } = {
     },
 
     // === 蓝色品质饰品 ===
-    
-    // 星辉耳饰
+
     7421: {
         uuid: 7421,
-        name: "星辉耳饰(Lv4)",
+        name: "星辉耳饰",
         type: EquipType.ACCESSORY,
         quality: Quality.BLUE,
-        lv: 4,
-        path: EPath["星辉耳饰"],
-        info: "生命值+35%，免伤+15%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 35, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7521: {
-        uuid: 7521,
-        name: "星辉耳饰(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.BLUE,
-        lv: 5,
         path: EPath["星辉耳饰"],
         info: "生命值+40%，免伤+20%",
         special_attr: [],
@@ -2444,27 +835,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 霜晶耳饰
     7422: {
         uuid: 7422,
-        name: "霜晶耳饰(Lv4)",
+        name: "霜晶耳饰",
         type: EquipType.ACCESSORY,
         quality: Quality.BLUE,
-        lv: 4,
-        path: EPath["霜晶耳饰"],
-        info: "攻击+35%，暴伤+25%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.ATK, value: 35, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.CRITICAL_DMG, value: 25, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7522: {
-        uuid: 7522,
-        name: "霜晶耳饰(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.BLUE,
-        lv: 5,
         path: EPath["霜晶耳饰"],
         info: "攻击+40%，暴伤+30%",
         special_attr: [],
@@ -2474,27 +849,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 流光吊坠
     7423: {
         uuid: 7423,
-        name: "流光吊坠(Lv4)",
+        name: "流光吊坠",
         type: EquipType.ACCESSORY,
         quality: Quality.BLUE,
-        lv: 4,
-        path: EPath["流光吊坠"],
-        info: "生命值+30%，闪避+10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.HP, value: 30, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.DODGE, value: 10, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7523: {
-        uuid: 7523,
-        name: "流光吊坠(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.BLUE,
-        lv: 5,
         path: EPath["流光吊坠"],
         info: "生命值+35%，闪避+15%",
         special_attr: [],
@@ -2504,27 +863,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 地脉指环
     7424: {
         uuid: 7424,
-        name: "地脉指环(Lv4)",
+        name: "地脉指环",
         type: EquipType.ACCESSORY,
         quality: Quality.BLUE,
-        lv: 4,
-        path: EPath["地脉指环"],
-        info: "免伤+15%，反伤+10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.REFLECT, value: 10, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7524: {
-        uuid: 7524,
-        name: "地脉指环(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.BLUE,
-        lv: 5,
         path: EPath["地脉指环"],
         info: "免伤+20%，反伤+15%",
         special_attr: [],
@@ -2534,27 +877,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 炎阳戒指
     7425: {
         uuid: 7425,
-        name: "炎阳戒指(Lv4)",
+        name: "炎阳戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.BLUE,
-        lv: 4,
-        path: EPath["炎阳戒指"],
-        info: "攻击+40%，闪避+5%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.ATK, value: 40, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.DODGE, value: 5, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7525: {
-        uuid: 7525,
-        name: "炎阳戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.BLUE,
-        lv: 5,
         path: EPath["炎阳戒指"],
         info: "攻击+45%，闪避+10%",
         special_attr: [],
@@ -2564,27 +891,12 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 潮汐戒指
+    
     7426: {
         uuid: 7426,
-        name: "潮汐戒指(Lv4)",
+        name: "潮汐戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.BLUE,
-        lv: 4,
-        path: EPath["潮汐戒指"],
-        info: "暴伤+30%，反伤+10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.CRITICAL_DMG, value: 30, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.REFLECT, value: 10, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7526: {
-        uuid: 7526,
-        name: "潮汐戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.BLUE,
-        lv: 5,
         path: EPath["潮汐戒指"],
         info: "暴伤+35%，反伤+15%",
         special_attr: [],
@@ -2596,29 +908,12 @@ export const EquipInfo: { [key: number]: EquipData } = {
 
     // === 紫色品质饰品 ===
     
-    // 天穹戒指
+    
     7441: {
         uuid: 7441,
-        name: "天穹戒指(Lv4)",
+        name: "天穹戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.PURPLE,
-        lv: 4,
-        path: EPath["天穹戒指"],
-        info: "生命值+40%，免伤+15%，攻击触发属性增加额外加值+1",
-        special_attr: [
-            {special_attr: EquipSpecialAttr.ATK_ADD_VALUE, special_attr_value: 1},
-        ],
-        buff: [
-            { type: BuffAttr.HP, value: 40, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7541: {
-        uuid: 7541,
-        name: "天穹戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.PURPLE,
-        lv: 5,
         path: EPath["天穹戒指"],
         info: "生命值+45%，免伤+20%，攻击触发属性增加额外加值+2",
         special_attr: [
@@ -2630,28 +925,12 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 神木戒指
+   
     7442: {
         uuid: 7442,
-        name: "神木戒指(Lv4)",
+        name: "神木戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.PURPLE,
-        lv: 4,
-        path: EPath["神木戒指"],
-        info: "攻击+45%，暴伤+30%，暴击+5%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.ATK, value: 45, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.CRITICAL_DMG, value: 30, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.CRITICAL, value: 5, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7542: {
-        uuid: 7542,
-        name: "神木戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.PURPLE,
-        lv: 5,
         path: EPath["神木戒指"],
         info: "攻击+50%，暴伤+35%，暴击+10%",
         special_attr: [],
@@ -2662,29 +941,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 日曜戒指
     7443: {
         uuid: 7443,
-        name: "日曜戒指(Lv4)",
+        name: "日曜戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.PURPLE,
-        lv: 4,
-        path: EPath["日曜戒指"],
-        info: "生命值+35%，攻击+40%，攻击触发增加主将攻击力+1",
-        special_attr: [
-            {special_attr: EquipSpecialAttr.ATK_ADD_MASTER_ATK, special_attr_value: 1},
-        ],
-        buff: [
-            { type: BuffAttr.HP, value: 35, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK, value: 40, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7543: {
-        uuid: 7543,
-        name: "日曜戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.PURPLE,
-        lv: 5,
         path: EPath["日曜戒指"],
         info: "生命值+40%，攻击+45%，攻击触发增加主将攻击力+2",
         special_attr: [
@@ -2696,29 +957,12 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 月影项链
+  
     7444: {
         uuid: 7444,
-        name: "月影项链(Lv4)",
+        name: "月影项链",
         type: EquipType.ACCESSORY,
         quality: Quality.PURPLE,
-        lv: 4,
-        path: EPath["月影项链"],
-        info: "免伤+15%，暴伤+30%，攻击触发增加主将生命值5",
-        special_attr: [
-            {special_attr: EquipSpecialAttr.ATK_ADD_MASTER_HP, special_attr_value: 5},
-        ],
-        buff: [
-            { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.CRITICAL_DMG, value: 30, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7544: {
-        uuid: 7544,
-        name: "月影项链(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.PURPLE,
-        lv: 5,
         path: EPath["月影项链"],
         info: "免伤+20%，暴伤+35%，攻击触发增加主将生命值10",
         special_attr: [
@@ -2730,28 +974,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 星尘项链
     7445: {
         uuid: 7445,
-        name: "星尘项链(Lv4)",
+        name: "星尘项链",
         type: EquipType.ACCESSORY,
         quality: Quality.PURPLE,
-        lv: 4,
-        path: EPath["星尘项链"],
-        info: "闪避+10%，攻击+45%，技能冷却减少10%",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.DODGE, value: 10, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.ATK, value: 45, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.SKILL_CD, value: 10, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7545: {
-        uuid: 7545,
-        name: "星尘项链(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.PURPLE,
-        lv: 5,
         path: EPath["星尘项链"],
         info: "闪避+15%，攻击+50%，技能冷却减少20%",
         special_attr: [],
@@ -2762,28 +989,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 深渊戒指
     7446: {
         uuid: 7446,
-        name: "深渊戒指(Lv4)",
+        name: "深渊戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.PURPLE,
-        lv: 4,
-        path: EPath["深渊戒指"],
-        info: "反伤+10%，生命值+45%，穿刺+1",
-        special_attr: [],
-        buff: [
-            { type: BuffAttr.REFLECT, value: 10, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.HP, value: 45, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.PUNCTURE, value: 1, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7546: {
-        uuid: 7546,
-        name: "深渊戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.PURPLE,
-        lv: 5,
         path: EPath["深渊戒指"],
         info: "反伤+15%，生命值+50%，穿刺+2",
         special_attr: [],
@@ -2794,29 +1004,11 @@ export const EquipInfo: { [key: number]: EquipData } = {
         ],
     },
 
-    // 永夜戒指
     7447: {
         uuid: 7447,
-        name: "永夜戒指(Lv4)",
+        name: "永夜戒指",
         type: EquipType.ACCESSORY,
         quality: Quality.PURPLE,
-        lv: 4,
-        path: EPath["永夜戒指"],
-        info: "免伤+20%，暴伤+30%，双倍受击触发+1",
-        special_attr: [
-            {special_attr: EquipSpecialAttr.DOUBLE_ATKED, special_attr_value: 1},
-        ],
-        buff: [
-            { type: BuffAttr.DEF, value: 20, target: EquipAttrTarget.HERO },
-            { type: BuffAttr.CRITICAL_DMG, value: 30, target: EquipAttrTarget.HERO },
-        ],
-    },
-    7547: {
-        uuid: 7547,
-        name: "永夜戒指(Lv5)",
-        type: EquipType.ACCESSORY,
-        quality: Quality.PURPLE,
-        lv: 5,
         path: EPath["永夜戒指"],
         info: "免伤+25%，暴伤+35%，双倍受击触发+2",
         special_attr: [
diff --git a/assets/script/game/common/config/GameEvent.ts b/assets/script/game/common/config/GameEvent.ts
index 03e8f3a4..8f807969 100644
--- a/assets/script/game/common/config/GameEvent.ts
+++ b/assets/script/game/common/config/GameEvent.ts
@@ -54,8 +54,7 @@ export enum GameEvent {
     UpdateHP = "UpdateHP",
     APChange = "APChange",
     EXPUP = "EXPUP",
-    EQUIP_STONE_UP = "EQUIP_STONE_UP",
-    SKILL_STONE_UP = "SKILL_STONE_UP",
+    
     ShopOpen = "ShopOpen",
     RestOpen = "RestOpen",
     HeroLvUp = "HeroLvUp",
diff --git a/assets/script/game/common/config/Mission.ts b/assets/script/game/common/config/Mission.ts
index 50178549..4dfed4d8 100644
--- a/assets/script/game/common/config/Mission.ts
+++ b/assets/script/game/common/config/Mission.ts
@@ -60,6 +60,10 @@ export enum FightSet {
     ORANGE_GOLD=4,//橙色金币
     BURN_COUNT=5,//默认易伤次数
     STUN_TIME=0.5,//默认晕时间
+    WEAPON_LV=2,//武器等级
+    SHIELD_LV=3,//护盾等级
+    ARMOR_LV=4,//防具等级
+    ACCESSORY_LV=5,//饰品等级
     // ATK_TO_ATK_RATIO=0.1,
     // ATK_TO_HP_RATIO=0.2,
     // ATK_TO_SHIELD_RATIO=2,
diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts
index 0b09a7a6..6f665900 100644
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -91,10 +91,11 @@ export enum DebuffAttr {
 
 //buff类型
 export enum BuffAttr {
-    ATK = 1,           // 攻击力
+    AP = 0, //攻击力 数值
+    ATK = 1,           // 攻击力百分比
     WFUNY = 2,     // 风怒
     ATK_CD = 3,     // 攻击速度
-    HP = 4,            // 生命值
+    HP = 4,            // 生命值比例
     DEF = 5,            // 免伤
     SKILL_DMG = 6,     // 技能效果
     SKILL_CD = 7,      // 技能冷却缩减
@@ -119,6 +120,7 @@ export enum BuffAttr {
     STUN_TIME = 25, //击晕额外时间
     STUN_RATTO = 26, //击晕概率
     FROST_TIME = 27, //冰冻时间
+    HP_MAX = 28, //最大生命值数值
 }
 
 export const geDebuffNum=()=>{
@@ -140,10 +142,11 @@ export const geDebuffNum=()=>{
 
 export const getBuffNum=()=>{
     return {
+        AP:0, //攻击力 数值
         ATK:0,           // 攻击力
         WFUNY:0,     // 风怒概率
         ATK_CD:0,     // 攻击速度
-        HP:0,            // 生命值
+        HP:0,            // 生命值 比例
         DEF:0,            // 免伤
         SKILL_DMG:0,     // 技能效果
         SKILL_CD:0,      // 技能冷却缩减
@@ -168,6 +171,7 @@ export const getBuffNum=()=>{
         STUN_TIME:0,
         STUN_RATTO:0,
         FROST_TIME:0,
+        HP_MAX:0,//最大生命值数值
     }   
 }
 
diff --git a/assets/script/game/hero/HeroConComp.ts b/assets/script/game/hero/HeroConComp.ts
new file mode 100644
index 00000000..80e4d250
--- /dev/null
+++ b/assets/script/game/hero/HeroConComp.ts
@@ -0,0 +1,82 @@
+import { _decorator } from "cc";
+import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
+import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp";
+import { oops } from "db://oops-framework/core/Oops";
+import { GameEvent } from "../common/config/GameEvent";
+import { EquipAttrTarget, EquipInfo } from "../common/config/Equips";
+import { HeroViewComp } from "./HeroViewComp";
+import { BuffAttr } from "../common/config/SkillSet";
+
+const { ccclass, property } = _decorator;
+
+/** 视图层对象 */
+@ccclass('HeroConCompComp')
+@ecs.register('HeroConComp', false)
+export class HeroConCompComp extends CCComp {
+    /** 视图层逻辑代码分离演示 */
+    heroView:HeroViewComp=null
+    protected onLoad(): void {
+        oops.message.on(GameEvent.EquipAdd,this.equip_add,this)
+        oops.message.on(GameEvent.EquipChange,this.equip_change,this)
+        oops.message.on(GameEvent.FightReady,this.fight_ready,this)
+        oops.message.on(GameEvent.UseSpecialCard,this.use_special_card,this)
+    }
+    start() {
+        this.heroView=this.node.getComponent(HeroViewComp)
+        // var entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
+        // this.on(ModuleEvent.Cmd, this.onHandler, this);
+    }
+    equip_add(e:GameEvent,data:any){
+        console.log("[HeroConCompComp]:equip_add",data)
+        let equip=EquipInfo[data.uuid]
+        let buffs=equip.buff
+        let special_attr=equip.special_attr
+        for(let i=0;i<buffs.length;i++){
+            let buff=buffs[i]
+            if(buff.target==EquipAttrTarget.HERO){
+                switch(buff.type){
+                    case BuffAttr.AP:
+                        this.heroView.add_ap(buff.value,true)
+                        break
+                    case BuffAttr.ATK:
+                        this.heroView.add_ap(buff.value,false)
+                        break
+                    case BuffAttr.ATK_CD:
+                        this.heroView.add_speed(buff.value)
+                        break
+                    case BuffAttr.DEF:
+                        this.heroView.add_def(buff.value)
+                        break
+                    case BuffAttr.HP:
+                        this.heroView.add_hp_max(buff.value,false)
+                        break
+                    case BuffAttr.HP_MAX:
+                        this.heroView.add_hp_max(buff.value,true)
+                        break
+                }
+            }
+        }
+    }
+    equip_change(e:GameEvent,data:any){
+        console.log("[HeroConCompComp]:equip_change",data)
+    }
+    fight_ready(e:GameEvent,data:any){
+        console.log("[HeroConCompComp]:fight_ready",data)
+    }
+    use_special_card(e:GameEvent,data:any){     
+        console.log("[HeroConCompComp]:use_special_card",data)
+    }
+
+    /** 全局消息逻辑处理 */
+    // private onHandler(event: string, args: any) {
+    //     switch (event) {
+    //         case ModuleEvent.Cmd:
+    //             break;
+    //     }
+    // }
+
+    /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */
+    reset() {
+        this.node.destroy();
+    }
+}
\ No newline at end of file
diff --git a/assets/script/game/hero/HeroConComp.ts.meta b/assets/script/game/hero/HeroConComp.ts.meta
new file mode 100644
index 00000000..d5b2195c
--- /dev/null
+++ b/assets/script/game/hero/HeroConComp.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "846e0307-e55e-4bc3-a9db-b387c89ad671",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts
index 4b32d393..5fc18de8 100644
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -53,10 +53,12 @@ export class HeroViewComp extends CCComp {
     hp: number = 100;   /** 血量 */
     hp_max: number = 100; /** 最大血量 */
     buff_hp:number=0;
+    hp_base:number=0;
 
     pwt:Timer = new Timer(1);  //计时器
     ap: number = 10; /**攻击力 */
     buff_ap:number=0;
+    ap_base:number=0;
     // atk_speed: number = 1;
     cd: number = 1.3;  /**攻击速度 攻击间隔 */
     dis: number = 80;
@@ -118,7 +120,6 @@ export class HeroViewComp extends CCComp {
         this.FIGHTCON=this.node.parent.getComponent(FightConComp);
         //console.log("[HeroViewComp]:hero view comp ",this.FIGHTCON)
         this.on(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,this.change_atk,this)
-        this.on(GameEvent.UpdateHP,this.update_hp,this)
         this.on(GameEvent.EXPUP,this.exp_up,this)
         this.on(GameEvent.UseEnhancement,this.use_enhancement,this)
         const collider = this.node.getComponent(BoxCollider2D);
@@ -218,11 +219,14 @@ export class HeroViewComp extends CCComp {
     add_ap(ap: number,is_num:boolean=true){
         //console.log("[HeroViewComp]:add_ap add:",ap,this.ap)
         if(is_num){
-            this.ap += Math.floor(ap);
+            this.ap_base += Math.floor(ap);
         }else{
-            this.ap += Math.floor(ap/100*this.ap);
+            this.buff_ap += Math.floor(ap/100*this.ap);
         }
-        this.BUFFCOMP.tooltip(TooltipTypes.apup,ap.toFixed(0));
+        let diff=Math.floor(this.ap_base*(100+this.buff_ap)/100)-this.ap    
+        this.ap = Math.floor(this.ap_base*(100+this.buff_ap)/100)   
+
+        this.BUFFCOMP.tooltip(TooltipTypes.apup,diff.toFixed(0));
 
         if(this.is_master) {
             this.BUFFCOMP.vmdata_update();
@@ -233,35 +237,37 @@ export class HeroViewComp extends CCComp {
     de_ap(ap: number,is_num:boolean=true){
         //console.log("[HeroViewComp]:de_ap de:",ap,this.ap)
         if(is_num){
-            this.ap -= Math.floor(ap);
+            this.ap_base -= Math.floor(ap);
         }else{
-            this.ap -= Math.floor(ap/100*this.ap);
+            this.buff_ap -= Math.floor(ap/100*this.ap);
         }
+        let diff=Math.floor(this.ap_base*(100+this.buff_ap)/100)-this.ap    
+        this.ap = Math.floor(this.ap_base*(100+this.buff_ap)/100)   
+
+        this.BUFFCOMP.tooltip(TooltipTypes.apup,diff.toFixed(0));
+
         if(this.is_master) this.BUFFCOMP.vmdata_update()
     }
-    update_hp(e:GameEvent,data:any){
-        //console.log("[HeroViewComp]:update_hp",data)
-        if(this.is_master===data.is_master&&this.fac===FacSet.HERO){
-            this.buff_hp += data.hp
-            if(data.hp > 0){
-                this.hp += this.hp_max*data.hp/100
-                if(this.hp > this.hp_max*(100+this.buff_hp)/100){
-                    this.hp=this.hp_max*(100+this.buff_hp)/100
-                }
-            }
-        }
-    }
-    add_hp_max(hp: number=0,is_num:boolean=true){
-        this.hp_max += Math.floor(hp) ;          
-        this.hp += Math.floor(hp*(100+this.buff_hp)/100) ;  
-        if(this.is_master) this.BUFFCOMP.vmdata_update(true)
-        this.BUFFCOMP.tooltip(TooltipTypes.hpup,hp.toFixed(0));
 
+    add_hp_max(hp: number=0,is_num:boolean=false){
+        if(is_num){ 
+            this.hp_base += Math.floor(hp) ;          
+        }else{
+            this.buff_hp+=hp         
+        }
+        let diff=Math.floor(this.hp_base*(100+this.buff_hp)/100)-this.hp_max
+        this.hp_max =Math.floor(this.hp_base*(100+this.buff_hp)/100)
+        this.hp+=diff
+        if(this.is_master) this.BUFFCOMP.vmdata_update(true)
+        this.BUFFCOMP.tooltip(TooltipTypes.hpup,diff.toFixed(0));
     }
 
     de_hp_max(hp: number=0,is_num:boolean=true){  //最大值 只存在数值添加, 比例通过buff_hp处理
         //console.log("[HeroViewComp]:de_hp_max de:",hp,this.hp_max)
-        this.hp_max -= Math.floor(hp) ;  
+        this.hp_base -= Math.floor(hp) ;  
+        let diff=Math.floor(this.hp_base*(100+this.buff_hp)/100)-this.hp_max
+        this.hp_max =Math.floor(this.hp_base*(100+this.buff_hp)/100)
+        this.hp+=diff
         if(this.is_master) this.BUFFCOMP.vmdata_update(true)
     }
 
@@ -332,13 +338,8 @@ export class HeroViewComp extends CCComp {
 
         if(this.fac==FacSet.MON){
             let exp=getExpDrops(HeroInfo[this.hero_uuid].quality,this.lv)
-            let stone=getStoneDrops(HeroInfo[this.hero_uuid].quality,this.lv)
             oops.message.dispatchEvent(GameEvent.EXPUP,{exp:exp})
-            if(stone.type=="equip"){
-                oops.message.dispatchEvent(GameEvent.EQUIP_STONE_UP,stone.count)
-            }else{
-                oops.message.dispatchEvent(GameEvent.SKILL_STONE_UP,stone.count)
-            }
+
         }
        
         if(this.fac==FacSet.HERO){
@@ -659,12 +660,12 @@ export class HeroViewComp extends CCComp {
     }
     to_update(){
         if(!this.is_master) return
-        // oops.message.dispatchEvent(GameEvent.HeroLvUp,{lv:this.lv})
+        
         
         smc.vmdata.hero.exp = smc.vmdata.hero.exp-smc.vmdata.hero.next_exp
         smc.vmdata.hero.lv = smc.vmdata.hero.lv+1
         smc.vmdata.hero.next_exp=getUpExp(smc.vmdata.hero.lv)
-        
+        oops.message.dispatchEvent(GameEvent.HeroLvUp,{lv:smc.vmdata.hero.lv})
         this.BUFFCOMP.lv_up()
         this.BUFFCOMP.tooltip(TooltipTypes.lvup)
         //@todo 需要添加  升级动画
diff --git a/assets/script/game/map/CardComp.ts b/assets/script/game/map/CardComp.ts
index b8526567..5346638b 100644
--- a/assets/script/game/map/CardComp.ts
+++ b/assets/script/game/map/CardComp.ts
@@ -226,23 +226,7 @@ export class CardComp extends CCComp {
                         console.log("[cardcomp]:装备卡 饰品")
                         break
                 }
-                switch(EquipInfo[this.c_uuid].lv){
-                    case 1:
-                        show.getChildByName("mask").getChildByName("lv1").active=true
-                        break
-                    case 2:
-                        show.getChildByName("mask").getChildByName("lv2").active=true
-                        break
-                    case 3:
-                        show.getChildByName("mask").getChildByName("lv3").active=true
-                        break
-                    case 4:
-                        show.getChildByName("mask").getChildByName("lv4").active=true
-                        break
-                    case 5:
-                        show.getChildByName("mask").getChildByName("lv5").active=true
-                        break
-                }
+                
                 show.getChildByName("type").getChildByName("name").getComponent(Label).string="装备"
                 break
             case cardType.SPECIAL:
diff --git a/assets/script/game/map/EquipSkillComp.ts b/assets/script/game/map/EquipSkillComp.ts
index 6b404156..dad8a11a 100644
--- a/assets/script/game/map/EquipSkillComp.ts
+++ b/assets/script/game/map/EquipSkillComp.ts
@@ -24,7 +24,6 @@ export class EquipSkillComp extends CCComp {
     onLoad() {
         this.on(GameEvent.UseSkillCard, this.get_skill, this);
         this.on(GameEvent.FightReady,this.fight_ready,this)
-        this.on(GameEvent.SKILL_STONE_UP,this.skill_stone_up,this)
         this.boxs=this.node.getChildByName("boxs")
         this.skill1_cd_bar_progress=this.boxs.getChildByName("skill1").getChildByName("icon").getChildByName("cd").getComponent(ProgressBar)
         this.skill2_cd_bar_progress=this.boxs.getChildByName("skill2").getChildByName("icon").getChildByName("cd").getComponent(ProgressBar)
diff --git a/assets/script/game/map/EquipsComp.ts b/assets/script/game/map/EquipsComp.ts
index ddd3cbcc..5176e5a8 100644
--- a/assets/script/game/map/EquipsComp.ts
+++ b/assets/script/game/map/EquipsComp.ts
@@ -24,69 +24,36 @@ export class EquipsComp extends Component {
         oops.message.on(GameEvent.EquipAdd,this.equip_add,this)
         oops.message.on(GameEvent.EquipRemove,this.equip_remove,this)
         this.boxs=this.node.getChildByName("boxs")
-        oops.message.on(GameEvent.EQUIP_STONE_UP,this.equip_stone_up,this)
+        oops.message.on(GameEvent.HeroLvUp,this.hero_lv_up,this)
 
     }
+    hero_lv_up(e:GameEvent,data:any){
+        switch(data.lv){
+            case FightSet.WEAPON_LV:
+                this.show_equip_get("weapon")
+                break
+            case FightSet.ARMOR_LV:
+                this.show_equip_get("armor")
+                break
+            case FightSet.SHIELD_LV:
+                this.show_equip_get("shield")
+                break
+            case FightSet.ACCESSORY_LV:
+                this.show_equip_get("accessory")
+                break
+        }
+    }
     equip_stone_up(e:GameEvent,data:any){
-        console.log("[EquipsComp]:equip_stone_up",data)
-        smc.vmdata.mission_data.equip_stone+=data
-        if(smc.vmdata.mission_data.equip_stone >= smc.vmdata.mission_data.equip_stone_max){   
-            this.show_equip_get("weapon")
-            this.show_equip_get("armor")
-            this.show_equip_get("accessory")
-        }
+      
     }
 
-    call_equip_card(e:any,data:any){
-        let mission_data=smc.vmdata.mission_data
-        if(mission_data.equip_stone < mission_data.equip_stone_max){
-            oops.gui.toast("装备石不足", false);
-            return
-        }
-        let lv=this.check_lv(data)
-        oops.message.dispatchEvent(GameEvent.EquipSelect,{slot:data,lv:lv})
-        mission_data.equip_stone-=mission_data.equip_stone_max
-        mission_data.equip_stone_max=mission_data.equip_stone_max*2
-        
+    call_equip_card(e:any,data:any){  
+        oops.message.dispatchEvent(GameEvent.EquipSelect,{slot:data})
+       
     }
     up_equip_card(e:any,data:any){
-        let mission_data=smc.vmdata.mission_data
-        if(mission_data.equip_stone < mission_data.equip_stone_max){
-            oops.gui.toast("装备石不足", false);
-            return
-        }
-        let lv=this.check_lv(data)
-        oops.message.dispatchEvent(GameEvent.EquipSelect,{slot:data,lv:lv})
-        mission_data.equip_stone-=mission_data.equip_stone_max
-        mission_data.equip_stone_max=mission_data.equip_stone_max*2
-        
-    }
-    check_lv(data:any){
-        let lv=0
-        switch(data){
-            case "weapon":
-                if(this.weapon.uuid==0) return 1    
-                lv=EquipInfo[this.weapon.uuid].lv+1
-                if(lv>5){
-                    lv=5
-                }
-                break
-            case "armor":
-                if(this.armor.uuid==0) return 1    
-                lv=EquipInfo[this.armor.uuid].lv+1
-                if(lv>5){
-                    lv=5
-                }
-                break
-            case "accessory":
-                if(this.accessory.uuid==0) return 4    
-                lv=EquipInfo[this.accessory.uuid].lv+1
-                if(lv>5){
-                    lv=5
-                }
-                break
-        }
-        return lv
+        oops.message.dispatchEvent(GameEvent.EquipSelect,{slot:data})
+    
     }
     start(){
         this.fight_ready()
@@ -141,7 +108,7 @@ export class EquipsComp extends Component {
             this.accessory.level=data.level
             this.show_accessory(data.uuid)
         }
-        this.count_attrs()
+        // this.count_attrs()
     }
     show_weapon(uuid:number){
         let icon = this.boxs.getChildByName("weapon").getChildByName("icon")
@@ -151,11 +118,6 @@ export class EquipsComp extends Component {
             const sprite = icon.getChildByName("icon").getComponent(Sprite);
             sprite.spriteFrame = atlas.getSpriteFrame(EquipInfo[uuid].path);
         });
-        icon.getChildByName("lv1").active=EquipInfo[uuid].lv==1
-        icon.getChildByName("lv2").active=EquipInfo[uuid].lv==2
-        icon.getChildByName("lv3").active=EquipInfo[uuid].lv==3
-        icon.getChildByName("lv4").active=EquipInfo[uuid].lv==4
-        icon.getChildByName("lv5").active=EquipInfo[uuid].lv==5
         icon.getChildByName("q1").active=EquipInfo[uuid].quality==Quality.WHITE
         icon.getChildByName("q2").active=EquipInfo[uuid].quality==Quality.GREEN
         icon.getChildByName("q3").active=EquipInfo[uuid].quality==Quality.BLUE
@@ -171,11 +133,7 @@ export class EquipsComp extends Component {
             const sprite = icon.getChildByName("icon").getComponent(Sprite);
             sprite.spriteFrame = atlas.getSpriteFrame(EquipInfo[uuid].path);
         });
-        icon.getChildByName("lv1").active=EquipInfo[uuid].lv==1
-        icon.getChildByName("lv2").active=EquipInfo[uuid].lv==2
-        icon.getChildByName("lv3").active=EquipInfo[uuid].lv==3
-        icon.getChildByName("lv4").active=EquipInfo[uuid].lv==4
-        icon.getChildByName("lv5").active=EquipInfo[uuid].lv==5
+
         
         icon.getChildByName("q1").active=EquipInfo[uuid].quality==Quality.WHITE
         icon.getChildByName("q2").active=EquipInfo[uuid].quality==Quality.GREEN
@@ -191,11 +149,7 @@ export class EquipsComp extends Component {
             const sprite = icon.getChildByName("icon").getComponent(Sprite);
             sprite.spriteFrame = atlas.getSpriteFrame(EquipInfo[uuid].path);
         });
-        icon.getChildByName("lv1").active=EquipInfo[uuid].lv==1
-        icon.getChildByName("lv2").active=EquipInfo[uuid].lv==2
-        icon.getChildByName("lv3").active=EquipInfo[uuid].lv==3
-        icon.getChildByName("lv4").active=EquipInfo[uuid].lv==4
-        icon.getChildByName("lv5").active=EquipInfo[uuid].lv==5
+
         
         icon.getChildByName("q1").active=EquipInfo[uuid].quality==Quality.WHITE
         icon.getChildByName("q2").active=EquipInfo[uuid].quality==Quality.GREEN
@@ -309,41 +263,25 @@ export class EquipsComp extends Component {
     }
     
     private show_equip_get(e:string){
-        if(this.weapon.uuid==0){
-            this.boxs.getChildByName("weapon").getChildByName("get").active =true
-            this.boxs.getChildByName("weapon").getChildByName("light").active=true
-            this.boxs.getChildByName("weapon").getChildByName("tip").active=true
-            this.boxs.getChildByName("weapon").getChildByName("tip").getComponent(Label).string="购买"
-        }else{
-            if(EquipInfo[this.weapon.uuid].lv>=5) return
-            this.boxs.getChildByName("weapon").getChildByName("change").active =true
-            this.boxs.getChildByName("weapon").getChildByName("light").active=true
-            this.boxs.getChildByName("weapon").getChildByName("tip").active=true
-            this.boxs.getChildByName("weapon").getChildByName("tip").getComponent(Label).string="升级"
-        }
-        if(this.armor.uuid==0){
-            this.boxs.getChildByName("armor").getChildByName("get").active =true
-            this.boxs.getChildByName("armor").getChildByName("light").active=true
-            this.boxs.getChildByName("armor").getChildByName("tip").active=true
-            this.boxs.getChildByName("armor").getChildByName("tip").getComponent(Label).string="购买"
-        }else{
-            if(EquipInfo[this.armor.uuid].lv>=5) return
-            this.boxs.getChildByName("armor").getChildByName("change").active =true
-            this.boxs.getChildByName("armor").getChildByName("light").active=true
-            this.boxs.getChildByName("armor").getChildByName("tip").active=true
-            this.boxs.getChildByName("armor").getChildByName("tip").getComponent(Label).string="升级"
-        }
-        if(this.accessory.uuid==0 ){
-            this.boxs.getChildByName("accessory").getChildByName("get").active =true
-            this.boxs.getChildByName("accessory").getChildByName("light").active=true
-            this.boxs.getChildByName("accessory").getChildByName("tip").active=true
-            this.boxs.getChildByName("accessory").getChildByName("tip").getComponent(Label).string="购买"
-        }else{
-            if(EquipInfo[this.accessory.uuid].lv>=5) return
-            this.boxs.getChildByName("accessory").getChildByName("change").active =true
-            this.boxs.getChildByName("accessory").getChildByName("light").active=true
-            this.boxs.getChildByName("accessory").getChildByName("tip").active=true
-            this.boxs.getChildByName("accessory").getChildByName("tip").getComponent(Label).string="升级"
+        switch(e){
+            case "weapon":
+                this.boxs.getChildByName("weapon").getChildByName("get").active =true
+                this.boxs.getChildByName("weapon").getChildByName("light").active=true
+                this.boxs.getChildByName("weapon").getChildByName("tip").active=true
+                this.boxs.getChildByName("weapon").getChildByName("tip").getComponent(Label).string="获取"
+                break
+            case "armor":
+                this.boxs.getChildByName("armor").getChildByName("get").active =true
+                this.boxs.getChildByName("armor").getChildByName("light").active=true
+                this.boxs.getChildByName("armor").getChildByName("tip").active=true
+                this.boxs.getChildByName("armor").getChildByName("tip").getComponent(Label).string="获取"
+                break
+            case "accessory":
+                this.boxs.getChildByName("accessory").getChildByName("get").active =true
+                this.boxs.getChildByName("accessory").getChildByName("light").active=true
+                this.boxs.getChildByName("accessory").getChildByName("tip").active=true
+                this.boxs.getChildByName("accessory").getChildByName("tip").getComponent(Label).string="获取"
+                break
         }
     }   
 
diff --git a/assets/script/game/map/FightConComp.ts b/assets/script/game/map/FightConComp.ts
index 22dfeca1..26816fa4 100644
--- a/assets/script/game/map/FightConComp.ts
+++ b/assets/script/game/map/FightConComp.ts
@@ -65,22 +65,7 @@ export class FightConComp extends Component {
    
 
     private equip_change(e:GameEvent,equip:any){
-        let old_hero_hp=JSON.parse(JSON.stringify(this.hero_buff.HP))
-        let new_hero_hp=JSON.parse(JSON.stringify(equip.hero_buff.HP))
-
-        this.hero_buff=equip.hero_buff
-        this.enemy_buff=equip.enemy_buff
-        let hero_hp_add=new_hero_hp-old_hero_hp
-        console.log("[FightConComp]:old_hero_hp:"+old_hero_hp+" new_hero_hp:"+new_hero_hp+" hero_hp_add:"+hero_hp_add)
-        if(hero_hp_add!==0){
-           
-            oops.message.dispatchEvent(GameEvent.UpdateHP,{hp:hero_hp_add,is_master:true})
-        }
-        
-      
-        this.scheduleOnce(()=>{
-            oops.message.dispatchEvent(GameEvent.UpdateVMData)
-        },0.1)
+       
     }
     
     private fight_ready(e:GameEvent){