dd

2025-06-23 10:49:15 +08:00
parent 6584fa0e72
commit c6fa6838db
9 changed files with 1164 additions and 562 deletions
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -150,17 +150,17 @@ export const SuperCards={
        info:"攻击触发提高英雄/伙伴属性的效果,额外添加+1攻击力"},
    3002:{uuid:3002,name:"附魔宝典",quality:Quality.WHITE,path:"3002",type:SuperCardsType.SPECIAL,value1:1,value2:0,value3:0,
        info:"攻击触发高英雄/伙伴属性的效果,额外添加+1生命值"},
-    3101:{uuid:3101,name:"陨石术",quality:Quality.WHITE,path:"3101",type:SuperCardsType.AOE,value1:SkillSet[6019].uuid,value2:3,value3:0,
+    3101:{uuid:3101,name:"陨石术",quality:Quality.GREEN,path:"3101",type:SuperCardsType.AOE,value1:SkillSet[6019].uuid,value2:3,value3:0,
        info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"},
-    3102:{uuid:3102,name:"冰刺",quality:Quality.WHITE,path:"3102",type:SuperCardsType.AOE,value1:SkillSet[6017].uuid,value2:3,value3:0,
+    3102:{uuid:3102,name:"冰刺",quality:Quality.BLUE,path:"3102",type:SuperCardsType.AOE,value1:SkillSet[6017].uuid,value2:3,value3:0,
        info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"},
-    3103:{uuid:3103,name:"潮汐",quality:Quality.WHITE,path:"3103",type:SuperCardsType.AOE,value1:SkillSet[6018].uuid,value2:3,value3:0,
+    3103:{uuid:3103,name:"潮汐",quality:Quality.BLUE,path:"3103",type:SuperCardsType.AOE,value1:SkillSet[6018].uuid,value2:3,value3:0,
        info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"},
-    3104:{uuid:3104,name:"龙卷风",quality:Quality.WHITE,path:"3104",type:SuperCardsType.AOE,value1:SkillSet[6013].uuid,value2:3,value3:0,
+    3104:{uuid:3104,name:"龙卷风",quality:Quality.BLUE,path:"3104",type:SuperCardsType.AOE,value1:SkillSet[6013].uuid,value2:3,value3:0,
        info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"},
-    3105:{uuid:3105,name:"火球风暴",quality:Quality.WHITE,path:"3105",type:SuperCardsType.AOE,value1:SkillSet[6012].uuid,value2:3,value3:0,
+    3105:{uuid:3105,name:"火球风暴",quality:Quality.PURPLE,path:"3105",type:SuperCardsType.AOE,value1:SkillSet[6012].uuid,value2:3,value3:0,
        info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"},
-    3106:{uuid:3106,name:"冰雨",quality:Quality.WHITE,path:"3106",type:SuperCardsType.AOE,value1:SkillSet[6020].uuid,value2:3,value3:0,
+    3106:{uuid:3106,name:"冰雨",quality:Quality.PURPLE,path:"3106",type:SuperCardsType.AOE,value1:SkillSet[6020].uuid,value2:3,value3:0,
        info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"},
    3201:{uuid:3201,name:"极速充能",quality:Quality.WHITE,path:"3201",type:SuperCardsType.BUFF,value1:10,value2:100,value3:0,
        info:"你的英雄/伙伴接下来的10次普通攻击速度提升100%"},
--- a/assets/script/game/common/config/Mission.ts
+++ b/assets/script/game/common/config/Mission.ts
@@ -68,6 +68,10 @@ export enum FightSet {
    ATK_ADD_GLOD=1,//金币增加
    CRIT_DAMAGE=50,//暴击伤害
    DOUBLE_ATK_RATE=100,//额外攻击默认概率
+    GREEN_GOLD=1,//绿色金币
+    BLUE_GOLD=2,//蓝色金币
+    PURPLE_GOLD=3,//紫色金币
+    ORANGE_GOLD=4,//橙色金币
    // ATK_TO_ATK_RATIO=0.1,
    // ATK_TO_HP_RATIO=0.2,
    // ATK_TO_SHIELD_RATIO=2,
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -1,4 +1,5 @@
 import { v3 } from "cc"
+import { Quality } from "./CardSet"

 /**
 * kind ：1:烈焰 2:寒冰  3:自然  4:暗影 5:神圣
@@ -31,7 +32,7 @@ export enum HeroFac {
   hero = 0,
   enemy = 1,
 }
-export const HeroList = [5001,5002,5003,5004,5005,5006,5007,5008,5009,5010,5011]
+export const HeroList = [5001,5002,5003,5004,5005,5006,5008,5009,5010,5011]
 export const MonList = [5201,5202,5203,5204,5205,5206,5216,5217,5218,5219,5220,5221,5222,5223,5224,5225,5226,5227]
 export const HeroSet = {
   Start_x:[-200,-260,-320],
@@ -42,6 +43,13 @@ export const HeroPos={
   1:{pos:v3(-220,0,0)},
   2:{pos:v3(-150,0,0)},
 }
+export const HeroQuality = {
+   WHITE:1,
+   GREEN:2,
+   BLUE:3,
+   PURPLE:4,
+   ORANGE:5,
+}
 export const MonSet = {
   0:{pos:v3(350,0,0)},
   1:{pos:v3(400,0,0)},
@@ -55,92 +63,89 @@ export const MonSet = {
   9:{pos:v3(800,0,0)},
 }
 export const HeroInfo = {
-   5001:{uuid:5001,name:"神圣守护",path:"k2",   lv:3,kind:1,type:0,hp:50,ap:10,dis:700,a_cd:1,
+   5001:{uuid:5001,name:"神圣守护",path:"k2",   lv:1,kind:1,type:0,hp:50,ap:10,dis:700,a_cd:1,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5002:{uuid:5002,name:"幻影剑豪",path:"k1",   lv:3,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,
+   5002:{uuid:5002,name:"幻影剑豪",path:"k1",   lv:1,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5003:{uuid:5003,name:"战争领主",path:"k5",   lv:3,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,
+   5003:{uuid:5003,name:"战争领主",path:"k5",   lv:1,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5004:{uuid:5004,name:"混沌法师",path:"zh1",  lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,
+   5004:{uuid:5004,name:"混沌法师",path:"zh1",  lv:1,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5005:{uuid:5005,name:"火焰法师",path:"zh2",  lv:3,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,
+   5005:{uuid:5005,name:"火焰法师",path:"zh2",  lv:1,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5006:{uuid:5006,name:"风暴精灵",path:"m4",   lv:3,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,
+   5006:{uuid:5006,name:"风暴精灵",path:"m4",   lv:1,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5007:{uuid:5007,name:"生命圣者",path:"d1",   lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,
+   5008:{uuid:5008,name:"战争祭祀",path:"d2",   lv:1,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5008:{uuid:5008,name:"战争祭祀",path:"d2",   lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,
-      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
-    
-   5009:{uuid:5009,name:"暴风射手",path:"a5",   lv:3,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,
+   5009:{uuid:5009,name:"暴风射手",path:"a5",   lv:1,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6002],info:"说明"},
    
-   5010:{uuid:5010,name:"苍穹射手",path:"a3",   lv:3,kind:1,type:1,hp:50,ap:15,dis:700,a_cd:1.2,
+   5010:{uuid:5010,name:"苍穹射手",path:"a3",   lv:1,kind:1,type:1,hp:50,ap:15,dis:700,a_cd:1.2,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6002],info:"说明"},
    
-   5011:{uuid:5011,name:"幽灵射手",path:"a4",   lv:3,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,
+   5011:{uuid:5011,name:"幽灵射手",path:"a4",   lv:1,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,quality:HeroQuality.BLUE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6002],info:"说明"},

  //怪物
-   5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,
+   5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5204:{uuid:5204,name:"石卫",    path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5204:{uuid:5204,name:"石卫",    path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5205:{uuid:5205,name:"土卫",    path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5205:{uuid:5205,name:"土卫",    path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5206:{uuid:5206,name:"树人",    path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5206:{uuid:5206,name:"树人",    path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
  
-   5216:{uuid:5216,name:"元素1",   path:"my1",  lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,
+   5216:{uuid:5216,name:"元素1",   path:"my1",  lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5217:{uuid:5217,name:"元素2",   path:"my2",  lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,
+   5217:{uuid:5217,name:"元素2",   path:"my2",  lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5218:{uuid:5218,name:"元素3",   path:"my3",  lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,
+   5218:{uuid:5218,name:"元素3",   path:"my3",  lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5219:{uuid:5219,name:"牛头战士",path:"mn1",  lv:2,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5219:{uuid:5219,name:"牛头战士",path:"mn1",  lv:2,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5220:{uuid:5220,name:"牛头战士",path:"mn2",  lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,
+   5220:{uuid:5220,name:"牛头战士",path:"mn2",  lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5221:{uuid:5221,name:"牛头战士",path:"mn3",  lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5221:{uuid:5221,name:"牛头战士",path:"mn3",  lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5222:{uuid:5222,name:"独眼巨人",path:"md1",  lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5222:{uuid:5222,name:"独眼巨人",path:"md1",  lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5223:{uuid:5223,name:"独眼巨人",path:"md2",  lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,
+   5223:{uuid:5223,name:"独眼巨人",path:"md2",  lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5224:{uuid:5224,name:"独眼巨人",path:"md3",  lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,
+   5224:{uuid:5224,name:"独眼巨人",path:"md3",  lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5225:{uuid:5225,name:"精英独眼",path:"md4",  lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,
+   5225:{uuid:5225,name:"精英独眼",path:"md4",  lv:1,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5226:{uuid:5226,name:"精英牛头",path:"mn4",  lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,
+   5226:{uuid:5226,name:"精英牛头",path:"mn4",  lv:1,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"},
    
-   5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,
+   5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:1,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE,
      crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}
 };

--- a/assets/script/game/map/CardComp.ts
+++ b/assets/script/game/map/CardComp.ts
@@ -11,6 +11,7 @@ import { smc } from "../common/SingletonModuleComp";
 import { HeroSkillList, SkillSet } from "../common/config/SkillSet";
 import { cardType, getRandomCardUUID, Quality, SuperCards } from "../common/config/CardSet";
 import { EquipInfo } from "../common/config/Equips";
+import { FightSet } from "../common/config/Mission";

 const { ccclass, property } = _decorator;

@@ -21,11 +22,10 @@ export class CardComp extends CCComp {
    c_uuid:number=0;
    c_type:number=0;  //1英雄,2 技能.3 装备 4.功能卡牌
    is_used:boolean=false;
-    
+    cost_gold:number=0;
    onLoad(){
        // this.on(GameEvent.HeroSelect,this.hero_select,this)
        // this.on(GameEvent.HeroSkillSelect,this.hero_skill_select,this)
-        // this.on(GameEvent.CardRefresh,this.rad,this)
    }

    start() {
@@ -39,7 +39,7 @@ export class CardComp extends CCComp {
    hero_select(args: any){
        this.c_type=cardType.HERO
        this.c_uuid=args.uuid
-        console.log("card hero_select c_uuid:"+this.c_uuid)
+        console.log("[cardcomp]:card hero_select c_uuid:"+this.c_uuid)
        this.show_hero(this.c_uuid)
        this.node.getChildByName("show").active=false
        this.node.getChildByName("anim").getChildByName("up").getComponent(Animation).play('carsup')
@@ -50,7 +50,7 @@ export class CardComp extends CCComp {
    }
    hero_skill_select(args: any){
        this.c_type=cardType.SKILL
-        console.log("card hero_skill_select",args)
+        console.log("[cardcomp]:card hero_skill_select",args)
        this.c_uuid=args.uuid
        this.node.getChildByName("show").active=false
        this.node.getChildByName("anim").getChildByName("up").getComponent(Animation).play('carsup')
@@ -72,7 +72,7 @@ export class CardComp extends CCComp {
            }, 0.1);
    }
    func_select(args: any){
-        console.log("card func_select",args)
+        console.log("[cardcomp]:card func_select",args)
        this.c_type=cardType.SPECIAL
        this.c_uuid=args.uuid
        this.node.getChildByName("show").active=false
@@ -86,7 +86,7 @@ export class CardComp extends CCComp {

    random_select(){
        let card =getRandomCardUUID() //随机获取卡牌类型
-        console.log("rad 开始请求卡牌",card)
+        console.log("[cardcomp]:rad 开始请求卡牌",card)
        switch(card.type){
            case cardType.HERO:
                this.hero_select(card)
@@ -106,17 +106,8 @@ export class CardComp extends CCComp {
    show_skill(uuid:number){
        let show=this.node.getChildByName("show")
        show.getChildByName("name").getChildByName("name").getComponent(Label).string=SkillSet[uuid].name
-        show.getChildByName("q1").active=SkillSet[uuid].quality==Quality.WHITE
-        show.getChildByName("q2").active=SkillSet[uuid].quality==Quality.GREEN
-        show.getChildByName("q3").active=SkillSet[uuid].quality==Quality.BLUE
-        show.getChildByName("q4").active=SkillSet[uuid].quality==Quality.PURPLE
-        show.getChildByName("q5").active=SkillSet[uuid].quality==Quality.ORANGE
-        show.getChildByName("mask").getChildByName("q1").active=SkillSet[uuid].quality==Quality.WHITE
-        show.getChildByName("mask").getChildByName("q2").active=SkillSet[uuid].quality==Quality.GREEN
-        show.getChildByName("mask").getChildByName("q3").active=SkillSet[uuid].quality==Quality.BLUE
-        show.getChildByName("mask").getChildByName("q4").active=SkillSet[uuid].quality==Quality.PURPLE
-        show.getChildByName("mask").getChildByName("q5").active=SkillSet[uuid].quality==Quality.ORANGE
-        this.do_card_bg_show()
+        this.do_card_bg_show(SkillSet[uuid].quality)
+        this.node.getChildByName("Button").getChildByName("coins").active=false
        var icon_path = "game/skills/skill_icon"
        resources.load(icon_path, SpriteAtlas, (err: any, atlas) => {
            const sprite = show.getChildByName("mask").getChildByName("skill").getComponent(Sprite);
@@ -124,28 +115,20 @@ export class CardComp extends CCComp {
        });
        show.getChildByName("info").getComponent(Label).string=SkillSet[uuid].info
    }
+
    show_hero(uuid:number){
        let show=this.node.getChildByName("show")
-        this.do_card_bg_show()
+        show.getChildByName("name").getChildByName("name").getComponent(Label).string=HeroInfo[uuid].name
+        this.do_card_bg_show(HeroInfo[uuid].quality)
+        this.node.getChildByName("Button").getChildByName("coins").active=false
        // show.getChildByName("ap").active=true
        // show.getChildByName("hp").active=true
-        show.getChildByName("name").getChildByName("name").getComponent(Label).string=HeroInfo[uuid].name
        // show.getChildByName("ap").getChildByName("num").getComponent(Label).string=HeroInfo[uuid].ap.toString()
        // show.getChildByName("hp").getChildByName("num").getComponent(Label).string=HeroInfo[uuid].hp.toString()
        // show.getChildByName("type").getChildByName("war").active=HeroInfo[uuid].type==0
        // show.getChildByName("type").getChildByName("bow").active=HeroInfo[uuid].type==1
        // show.getChildByName("type").getChildByName("mag").active=HeroInfo[uuid].type==2
        // show.getChildByName("lv").getChildByName("num").getComponent(Label).string=HeroInfo[uuid].lv.toString()
-        show.getChildByName("q1").active=HeroInfo[uuid].quality==Quality.WHITE
-        show.getChildByName("q2").active=HeroInfo[uuid].quality==Quality.GREEN
-        show.getChildByName("q3").active=HeroInfo[uuid].quality==Quality.BLUE
-        show.getChildByName("q4").active=HeroInfo[uuid].quality==Quality.PURPLE
-        show.getChildByName("q5").active=HeroInfo[uuid].quality==Quality.ORANGE
-        show.getChildByName("mask").getChildByName("q1").active=HeroInfo[uuid].quality==Quality.WHITE
-        show.getChildByName("mask").getChildByName("q2").active=HeroInfo[uuid].quality==Quality.GREEN
-        show.getChildByName("mask").getChildByName("q3").active=HeroInfo[uuid].quality==Quality.BLUE
-        show.getChildByName("mask").getChildByName("q4").active=HeroInfo[uuid].quality==Quality.PURPLE
-        show.getChildByName("mask").getChildByName("q5").active=HeroInfo[uuid].quality==Quality.ORANGE
        var icon_path = "game/heros/herois"
        resources.load(icon_path, SpriteAtlas, (err: any, atlas) => {
            const sprite = show.getChildByName("mask").getChildByName("hero").getComponent(Sprite);
@@ -154,20 +137,11 @@ export class CardComp extends CCComp {
        show.getChildByName("info").getComponent(Label).string=HeroInfo[uuid].info

    }
+
    show_equip(uuid:number){
        let show=this.node.getChildByName("show")
-        this.do_card_bg_show()
-        show.getChildByName("q1").active=EquipInfo[uuid].quality==Quality.WHITE
-        show.getChildByName("q2").active=EquipInfo[uuid].quality==Quality.GREEN
-        show.getChildByName("q3").active=EquipInfo[uuid].quality==Quality.BLUE
-        show.getChildByName("q4").active=EquipInfo[uuid].quality==Quality.PURPLE
-        show.getChildByName("q5").active=EquipInfo[uuid].quality==Quality.ORANGE
-        show.getChildByName("mask").getChildByName("q1").active=EquipInfo[uuid].quality==Quality.WHITE
-        show.getChildByName("mask").getChildByName("q2").active=EquipInfo[uuid].quality==Quality.GREEN
-        show.getChildByName("mask").getChildByName("q3").active=EquipInfo[uuid].quality==Quality.BLUE
-        show.getChildByName("mask").getChildByName("q4").active=EquipInfo[uuid].quality==Quality.PURPLE
-        show.getChildByName("mask").getChildByName("q5").active=EquipInfo[uuid].quality==Quality.ORANGE
        show.getChildByName("name").getChildByName("name").getComponent(Label).string=EquipInfo[uuid].name
+        this.do_card_bg_show(EquipInfo[uuid].quality)
        var icon_path = "game/heros/equips"
        resources.load(icon_path, SpriteAtlas, (err: any, atlas) => {
            const sprite = show.getChildByName("mask").getChildByName("equip").getComponent(Sprite);
@@ -175,21 +149,11 @@ export class CardComp extends CCComp {
        });
        show.getChildByName("info").getComponent(Label).string=EquipInfo[uuid].info
    }
+
    show_func(uuid:number){
        let show=this.node.getChildByName("show")
-        this.do_card_bg_show()
-        show.getChildByName("q1").active=SuperCards[uuid].quality==Quality.WHITE
-        show.getChildByName("q2").active=SuperCards[uuid].quality==Quality.GREEN
-        show.getChildByName("q3").active=SuperCards[uuid].quality==Quality.BLUE
-        show.getChildByName("q4").active=SuperCards[uuid].quality==Quality.PURPLE
-        show.getChildByName("q5").active=SuperCards[uuid].quality==Quality.ORANGE
-        show.getChildByName("mask").getChildByName("q1").active=SuperCards[uuid].quality==Quality.WHITE
-        show.getChildByName("mask").getChildByName("q2").active=SuperCards[uuid].quality==Quality.GREEN
-        show.getChildByName("mask").getChildByName("q3").active=SuperCards[uuid].quality==Quality.BLUE
-        show.getChildByName("mask").getChildByName("q4").active=SuperCards[uuid].quality==Quality.PURPLE
-        show.getChildByName("mask").getChildByName("q5").active=SuperCards[uuid].quality==Quality.ORANGE
        show.getChildByName("name").getChildByName("name").getComponent(Label).string=SuperCards[uuid].name
-
+        this.do_card_bg_show(SuperCards[uuid].quality)
        
        var icon_path = "game/heros/cards"
        resources.load(icon_path, SpriteAtlas, (err: any, atlas) => {
@@ -198,7 +162,8 @@ export class CardComp extends CCComp {
        });
        show.getChildByName("info").getComponent(Label).string=SuperCards[uuid].info
    }
-    do_card_bg_show(){
+
+    do_card_bg_show(q:number=Quality.WHITE){
        this.node.getChildByName("Button").getChildByName("Label").getComponent(Label).string=this.check_heros()
        let show=this.node.getChildByName("show")
        show.getChildByName("ap").active=false
@@ -225,6 +190,36 @@ export class CardComp extends CCComp {
                show.getChildByName("type").getChildByName("name").getComponent(Label).string="特效"
                break
        }
+        show.getChildByName("q1").active=q==Quality.WHITE
+        show.getChildByName("q2").active=q==Quality.GREEN
+        show.getChildByName("q3").active=q==Quality.BLUE
+        show.getChildByName("q4").active=q==Quality.PURPLE
+        show.getChildByName("q5").active=q==Quality.ORANGE
+        show.getChildByName("mask").getChildByName("q1").active=q==Quality.WHITE
+        show.getChildByName("mask").getChildByName("q2").active=q==Quality.GREEN
+        show.getChildByName("mask").getChildByName("q3").active=q==Quality.BLUE
+        show.getChildByName("mask").getChildByName("q4").active=q==Quality.PURPLE
+        show.getChildByName("mask").getChildByName("q5").active=q==Quality.ORANGE
+        this.node.getChildByName("Button").getChildByName("coins").active=true
+        this.node.getChildByName("Button").getChildByName("coins").getChildByName("num").getComponent(Label).string=this.get_cost_gold(q).toString()
+    }
+ 
+    get_cost_gold(quality:number){
+        switch(quality){
+            case Quality.GREEN:
+                return FightSet.GREEN_GOLD
+                
+            case Quality.BLUE:
+                return FightSet.BLUE_GOLD
+                
+            case Quality.PURPLE:
+                return FightSet.PURPLE_GOLD
+                
+            case Quality.ORANGE:
+                return FightSet.ORANGE_GOLD
+            default:
+                return 0
+        }
    }
    check_heros(){
        // let heros=ecs.query(ecs.allOf(HeroModelComp))
@@ -238,33 +233,45 @@ export class CardComp extends CCComp {
        //  }
         return "购买"
    }
+    reset_card(){
+        this.cost_gold=0
+        this.c_type=0
+        this.c_uuid=0
+        this.is_used=false
+    }
    use_card(){
        switch(this.c_type){
            case cardType.HERO:
-                if(smc.vmdata.mission_data.gold< smc.vmdata.mission_data.call_gold){
-                    oops.gui.toast("金币不足", false);
-                    return
-                }
                oops.message.dispatchEvent(GameEvent.UseHeroCard,{uuid:this.c_uuid})
-                smc.vmdata.mission_data.gold-=smc.vmdata.mission_data.call_gold
                oops.message.dispatchEvent(GameEvent.CardsClose)
                break
            case cardType.SKILL:
-                console.log("use_card 技能卡")
+                console.log("[cardcomp]:use_card 技能卡")
                oops.message.dispatchEvent(GameEvent.UseSkillCard,{uuid:this.c_uuid})
                oops.message.dispatchEvent(GameEvent.CardsClose)
                break
            case cardType.EQUIP:
-                console.log("use_card 装备卡")
+                console.log("[cardcomp]:use_card 装备卡")
+                if(!this.cost_gold_check())  return   
                oops.message.dispatchEvent(GameEvent.EquipAdd,{uuid:this.c_uuid,type:EquipInfo[this.c_uuid].type})
                oops.message.dispatchEvent(GameEvent.CardsClose)
                break
            case cardType.SPECIAL:
-                console.log("use_card 功能卡")
+                console.log("[cardcomp]:use_card 功能卡")
+                if(!this.cost_gold_check())  return   
                oops.message.dispatchEvent(GameEvent.UseSpecialCard,{uuid:this.c_uuid})
                oops.message.dispatchEvent(GameEvent.CardsClose)
                break
        }
+        this.reset_card()
+    }
+    cost_gold_check(){
+        if(smc.vmdata.mission_data.gold< this.cost_gold){
+            oops.gui.toast("[cardcomp]:金币不足", false);
+            return false
+        }
+        smc.vmdata.mission_data.gold-=this.cost_gold
+        return true
    }
    reset() {
        this.node.destroy();
--- a/assets/script/game/map/CardsComp.ts
+++ b/assets/script/game/map/CardsComp.ts
@@ -185,8 +185,8 @@ export class CardsCompComp extends CCComp {
    //放弃选择
    give_up_select(){
        this.hide()
-        let mission_data=smc.vmdata.mission_data
-        mission_data.gold+=(mission_data.back_gold+mission_data.buff_back_gold) //返还金币
+        // let mission_data=smc.vmdata.mission_data
+        // mission_data.gold+=(mission_data.back_gold+mission_data.buff_back_gold) //返还金币
    }

    /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */
--- a/assets/script/game/map/MissionComp.ts
+++ b/assets/script/game/map/MissionComp.ts
@@ -160,6 +160,9 @@ export class MissionComp extends CCComp {
        mission_data.gold-=(mission_data.refresh_gold+mission_data.buff_refresh_gold)
        
    }
+    call_friend_card(){
+        oops.message.dispatchEvent(GameEvent.HeroSelect)
+    }
    call_equip_card(){
        let mission_data=smc.vmdata.mission_data
        if(mission_data.gold < (mission_data.refresh_gold+mission_data.buff_refresh_gold)){
--- a/assets/script/todo.md
+++ b/assets/script/todo.md
@@ -21,16 +21,17 @@
 - [x]  每攻击n次后 增加1金币
 - [x]  死亡 , 被攻击触发 2次
 - [x]  暴击闪避 加入
- [ ]  卡牌设定,卡牌icon
- [ ]  清理技能动画 及设置
+- [x]  卡牌设定,卡牌icon
+- [x]  清理技能动画 及设置
+- [x]  技能需要重新设计
 - [ ]  伙伴特殊技能设定
- [ ]  技能需要重新设计
 - [x]  debuff 设定  易伤 为次数和伤害累加
 - [ ]  冰冻 眩晕 功能更新 还需要检验
- [ ]  分按钮三选一, 装备,  功能卡,   副将和技能,特殊情况下 触发更换和获取
- [ ]  修改 发现都是1金币,加白色0金币 绿色+1金币,蓝色+2金币  
+- [x]  分按钮三选一, 装备,  功能卡,   
+- [ ]  副将和技能,特殊情况下 触发更换和获取
+- [x]  修改 发现都是1金币,加白色0金币 绿色+1金币,蓝色+2金币  
 - [ ]  刷新免费1回合,看广告 再刷新一回 
- [ ]   广告拿紫色品质,  各品质装备 属性相差20% ,紫色品质 一定几率出现,出现后 10秒后消失
+- [ ]  广告拿紫色品质,  各品质装备 属性相差20% ,紫色品质 一定几率出现,出现后 10秒后消失
 - [ ]  装备设定,借助AI
 - [ ]  添加玩家自主 激活额外boss 按钮,额外boss 有特殊事件
 - [ ]