dd

assets/resources/gui/element/tals.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "567e7bb0-5716-4d8a-bd6c-557a241b2d46",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "tals"
-  }
-}

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

@@ -2,7 +2,7 @@
      CardList type: 1:伙伴 2:技能 3:装备
  */
 
-import { getHeroList, HeroList } from "./heroSet"
+import { getHeroList } from "./heroSet"
 import { BuffAttr, getSkills, HeroSkillList, SkillSet } from "./SkillSet"
 import { equip_list, weapons, armors, accessorys, getEquipUUIDsByType } from "./Equips"
 import { getEnhancement } from "./LevelUp"
@@ -58,7 +58,7 @@ export function getRandomCardUUID(
     let cardList: number[] = [];
     switch (c_type) {
         case cardType.HERO: // 伙伴
-            cardList = HeroList;
+            cardList = getHeroList();
             break;
         case cardType.SKILL: // 技能
             cardList = HeroSkillList;
@@ -82,7 +82,7 @@ export function getRandomCardUUIDByType(type: number): number {
     let cardList: number[] = [];
     switch (type) {
         case cardType.HERO: // 伙伴
-            cardList = HeroList;
+            cardList = getHeroList();
             break;
         case cardType.SKILL: // 技能
             cardList = HeroSkillList;
@@ -111,7 +111,7 @@ export function getRandomCardsByType(
     let cardList: number[] = [];
     switch (type) {
         case cardType.HERO:
-            cardList = getHeroList();  //hero选项是1和0  1是主将
+            cardList = getHeroList(data);  //hero选项是1和0  1是主将
             break;
         case cardType.SKILL:
             cardList = getSkills(data);  // 技能时 data是品质

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

@@ -29,7 +29,7 @@ export enum HType {
    mage = 2,
 }
 //fac:FacSet.HERO   
-export const getHeroList = (quality:number)=>{
+export const getHeroList = (quality:number=0)=>{
   return Object.values(HeroInfo).filter(item=>{
     const facMatch = item.fac === FacSet.HERO;
     const qualityMatch = quality === 0 || item.quality === quality;
@@ -37,7 +37,7 @@ export const getHeroList = (quality:number)=>{
   }).map(item=>item.uuid)
 }
 //fac:FacSet.MON
-export const getMonList = (quality:number)=>{
+export const getMonList = (quality:number=0)=>{
   return Object.values(HeroInfo).filter(item=>{
     const facMatch = item.fac === FacSet.MON;
     const qualityMatch = quality === 0 || item.quality === quality;

assets/script/game/map/CardsComp.ts

@@ -11,7 +11,7 @@ import { getSkills, Quality } from "../common/config/SkillSet";
 import { getEnhancement } from "../common/config/LevelUp";
 import { FightSet } from "../common/config/Mission";
 import { oops } from "db://oops-framework/core/Oops";
-import { getHeroListByCalled } from "../common/config/heroSet";
+import { getHeroList } from "../common/config/heroSet";
 
 const { ccclass, property } = _decorator;
 
@@ -127,7 +127,7 @@ export class CardsCompComp extends CCComp {
     }
     hero_select(data:any){
         
-        let list=getHeroListByCalled(3,data.called)
+        let list=getHeroList(data.called)
         console.log("[CardsComp]:英雄选择卡牌列表",list)
         this.card1c.hero_select(list[0])
         this.card2c.hero_select(list[1])