完成 剑类 初步设计

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

@@ -4,7 +4,7 @@
 
 import { HeroList } from "./heroSet"
 import { HeroSkillList, SkillSet } from "./SkillSet"
-import { accessorys, armors, equip_list, EquipType, weapons } from "./Equips"
+import { equip_list, weapons, armors, accessorys } from "./Equips"
 
 //1:伙伴 2:技能 3:装备的出现概率配置
 export const CardProbability={
@@ -100,7 +100,7 @@ export function getRandomCardUUIDByType(type: number): number {
 export function getRandomCardsByType(
     type: number,
     count: number,
-    equipSubType?: number // 新增参数
+    equipSubType?: number // 新增参数：装备子类型 1:武器 2:防具 3:饰品 0或undefined:全部
 ): { type: number; uuid: number }[] {
     let cardList: number[] = [];
     switch (type) {
@@ -111,16 +111,24 @@ export function getRandomCardsByType(
             cardList = HeroSkillList;  // 直接使用HeroSkillList数组
             break;
         case cardType.EQUIP:
-            switch(equipSubType){
-                case EquipType.WEAPON:
-                    cardList = weapons  ;
-                    break;
-                case EquipType.ARMOR:
-                    cardList = armors;
-                    break;
-                case EquipType.ACCESSORY:
-                    cardList = accessorys;
-                    break;
+            // 根据装备子类型筛选
+            if (equipSubType && equipSubType > 0) {
+                switch (equipSubType) {
+                    case 1: // 武器
+                        cardList = weapons;
+                        break;
+                    case 2: // 防具
+                        cardList = armors;
+                        break;
+                    case 3: // 饰品
+                        cardList = accessorys;
+                        break;
+                    default:
+                        cardList = equip_list;
+                        break;
+                }
+            } else {
+                cardList = equip_list;
             }
             break;
         case cardType.SPECIAL: