From 3582521e4e9638299847892c388f00d0cb6c055d Mon Sep 17 00:00:00 2001 From: panw Date: Thu, 19 Jun 2025 16:38:20 +0800 Subject: [PATCH] dd --- assets/script/game/common/config/CardSet.ts | 10 +-- assets/script/game/common/config/heroSet.ts | 70 ++++++++++----------- assets/script/game/map/CardComp.ts | 6 +- assets/script/game/map/CardsComp.ts | 6 +- assets/script/game/map/FightConComp.ts | 20 ++++++ 5 files changed, 68 insertions(+), 44 deletions(-) diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 11392d29..fad44024 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -139,9 +139,9 @@ export const SuperCardsType={ } export const SuperCardsList=[3001,3002,3101,3201,3301]; export const SuperCards={ - 3001:{uuid:3001,name:"附魔宝典",path:"3001",type:SuperCardsType.SPECIAL,value1:1,value2:0,value3:0,tals:"你的提升英雄/伙伴属性的装备效果,额外添加+1攻击力"}, - 3002:{uuid:3002,name:"附魔宝典",path:"3002",type:SuperCardsType.SPECIAL,value1:0,value2:1,value3:0,tals:"你的提升英雄/伙伴属性的装备效果,额外添加+1生命值"}, - 3101:{uuid:3101,name:"火球风暴",path:"3101",type:SuperCardsType.AOE,value1:10,value2:300,value3:10,tals:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害,并造成易伤(下10次伤害)"}, - 3201:{uuid:3201,name:"极速充能",path:"3201",type:SuperCardsType.BUFF,value1:10,value2:100,value3:0,tals:"你的英雄/伙伴接下来的10次普通攻击速度提升100%"}, - 3301:{uuid:3301,name:"冰霜风暴",path:"3301",type:SuperCardsType.DEBUFF,value1:30,value2:10,value3:0,tals:"场上敌人获得30%的易伤,(下10次伤害)"}, + 3001:{uuid:3001,name:"附魔宝典",path:"3001",type:SuperCardsType.SPECIAL,value1:1,value2:0,value3:0,info:"你的提升英雄/伙伴属性的装备效果,额外添加+1攻击力"}, + 3002:{uuid:3002,name:"附魔宝典",path:"3002",type:SuperCardsType.SPECIAL,value1:0,value2:1,value3:0,info:"你的提升英雄/伙伴属性的装备效果,额外添加+1生命值"}, + 3101:{uuid:3101,name:"火球风暴",path:"3101",type:SuperCardsType.AOE,value1:10,value2:300,value3:10,info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害,并造成易伤(下10次伤害)"}, + 3201:{uuid:3201,name:"极速充能",path:"3201",type:SuperCardsType.BUFF,value1:10,value2:100,value3:0,info:"你的英雄/伙伴接下来的10次普通攻击速度提升100%"}, + 3301:{uuid:3301,name:"冰霜风暴",path:"3301",type:SuperCardsType.DEBUFF,value1:30,value2:10,value3:0,info:"场上敌人获得30%的易伤,(下10次伤害)"}, } diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 16d9e503..b73c568a 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -48,41 +48,41 @@ export const MonSet = { 2:{pos:v3(320,-15,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,speed:30,skills:[6001],tals:"说明"}, - 5002:{uuid:5002,name:"幻影剑豪",path:"k1", lv:3,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5003:{uuid:5003,name:"战争领主",path:"k5", lv:3,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5004:{uuid:5004,name:"混沌法师",path:"zh1", lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5005:{uuid:5005,name:"火焰法师",path:"zh2", lv:3,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5006:{uuid:5006,name:"风暴精灵",path:"m4", lv:3,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5007:{uuid:5007,name:"生命圣者",path:"d1", lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5008:{uuid:5008,name:"战争祭祀",path:"d2", lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5009:{uuid:5009,name:"暴风射手",path:"a5", lv:3,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,speed:30,skills:[6006],tals:"说明"}, - 5010:{uuid:5010,name:"苍穹射手",path:"a3", lv:3,kind:1,type:1,hp:50,ap:15,dis:700,a_cd:1.2,speed:30,skills:[6006],tals:"说明"}, - 5011:{uuid:5011,name:"幽灵射手",path:"a4", lv:3,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,speed:30,skills:[6006],tals:"说明"}, - 5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],tals:"说明"}, - 5204:{uuid:5204,name:"石卫", path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5205:{uuid:5205,name:"土卫", path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5206:{uuid:5206,name:"树人", path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5210:{uuid:5210,name:"骷髅战士",path:"mkl4", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5211:{uuid:5211,name:"骷髅战士",path:"mkl5", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5212:{uuid:5212,name:"骷髅战士",path:"mkl6", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5213:{uuid:5213,name:"骷髅射手",path:"mkla1",lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],tals:"说明"}, - 5214:{uuid:5214,name:"骷髅射手",path:"mkla2",lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],tals:"说明"}, - 5215:{uuid:5215,name:"骷髅射手",path:"mkla3",lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],tals:"说明"}, - 5216:{uuid:5216,name:"元素1", path:"my1", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5217:{uuid:5217,name:"元素2", path:"my2", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5218:{uuid:5218,name:"元素3", path:"my3", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,speed:30,skills:[6001],tals:"说明"}, - 5219:{uuid:5219,name:"牛头战士",path:"mn1", lv:2,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5220:{uuid:5220,name:"牛头战士",path:"mn2", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],tals:"说明"}, - 5221:{uuid:5221,name:"牛头战士",path:"mn3", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5222:{uuid:5222,name:"独眼巨人",path:"md1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5223:{uuid:5223,name:"独眼巨人",path:"md2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5224:{uuid:5224,name:"独眼巨人",path:"md3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],tals:"说明"}, - 5225:{uuid:5225,name:"精英独眼",path:"md4", lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5226:{uuid:5226,name:"精英牛头",path:"mn4", lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"}, - 5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],tals:"说明"} + 5001:{uuid:5001,name:"神圣守护",path:"k2", lv:3,kind:1,type:0,hp:50,ap:10,dis:700,a_cd:1,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,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,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,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,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,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,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,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,speed:30,skills:[6006],info:"说明"}, + 5010:{uuid:5010,name:"苍穹射手",path:"a3", lv:3,kind:1,type:1,hp:50,ap:15,dis:700,a_cd:1.2,speed:30,skills:[6006],info:"说明"}, + 5011:{uuid:5011,name:"幽灵射手",path:"a4", lv:3,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,speed:30,skills:[6006],info:"说明"}, + 5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,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,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,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,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,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,speed:30,skills:[6001],info:"说明"}, + 5210:{uuid:5210,name:"骷髅战士",path:"mkl4", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],info:"说明"}, + 5211:{uuid:5211,name:"骷髅战士",path:"mkl5", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],info:"说明"}, + 5212:{uuid:5212,name:"骷髅战士",path:"mkl6", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,speed:30,skills:[6001],info:"说明"}, + 5213:{uuid:5213,name:"骷髅射手",path:"mkla1",lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],info:"说明"}, + 5214:{uuid:5214,name:"骷髅射手",path:"mkla2",lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,speed:30,skills:[6001],info:"说明"}, + 5215:{uuid:5215,name:"骷髅射手",path:"mkla3",lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,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,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,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,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,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,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,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,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,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,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,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,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,speed:30,skills:[6001],info:"说明"} }; export const HeroUpInfo = { 5001:{ap_up:0,ap_up_rate:10,self_ap_up:0,self_ap_up_rate:0,hp_up:0,self_hp_up:0}, diff --git a/assets/script/game/map/CardComp.ts b/assets/script/game/map/CardComp.ts index 4bf1a1ad..674302a3 100644 --- a/assets/script/game/map/CardComp.ts +++ b/assets/script/game/map/CardComp.ts @@ -112,6 +112,7 @@ export class CardComp extends CCComp { const sprite = show.getChildByName("mask").getChildByName("skill").getComponent(Sprite); sprite.spriteFrame = atlas.getSpriteFrame(SkillSet[uuid].path); }); + show.getChildByName("info").getComponent(Label).string=SkillSet[uuid].info } show_hero(uuid:number){ let show=this.node.getChildByName("show") @@ -130,6 +131,8 @@ export class CardComp extends CCComp { const sprite = show.getChildByName("mask").getChildByName("hero").getComponent(Sprite); sprite.spriteFrame = atlas.getSpriteFrame(HeroInfo[uuid].path); }); + show.getChildByName("info").getComponent(Label).string=HeroInfo[uuid].info + } show_equip(uuid:number){ let show=this.node.getChildByName("show") @@ -140,6 +143,7 @@ export class CardComp extends CCComp { const sprite = show.getChildByName("mask").getChildByName("equip").getComponent(Sprite); sprite.spriteFrame = atlas.getSpriteFrame(EquipInfo[uuid].uuid.toString()); }); + show.getChildByName("info").getComponent(Label).string=EquipInfo[uuid].info } show_func(uuid:number){ let show=this.node.getChildByName("show") @@ -150,7 +154,7 @@ export class CardComp extends CCComp { const sprite = show.getChildByName("mask").getChildByName("func").getComponent(Sprite); sprite.spriteFrame = atlas.getSpriteFrame(SuperCards[uuid].path); }); - + show.getChildByName("info").getComponent(Label).string=SuperCards[uuid].info } do_card_bg_show(){ this.node.getChildByName("Button").getChildByName("Label").getComponent(Label).string=this.check_heros() diff --git a/assets/script/game/map/CardsComp.ts b/assets/script/game/map/CardsComp.ts index 2f05da77..16b14310 100644 --- a/assets/script/game/map/CardsComp.ts +++ b/assets/script/game/map/CardsComp.ts @@ -89,7 +89,7 @@ export class CardsCompComp extends CCComp { /** 添加卡牌展示到队列 */ private addToQueue(e: GameEvent, data?: any) { - console.log("[CardsComp]:添加卡牌到队列", e); + console.log("[CardsComp]:添加卡牌到队列", e,data); this.cardQueue.push({type: e, data: data}); this.processQueue(); } @@ -119,7 +119,7 @@ export class CardsCompComp extends CCComp { case GameEvent.CardRefresh: console.log("[CardsComp]:显示随机刷新卡牌") this.node.getChildByName("Button").active=true - this.random_select() + this.func_select() break } this.show() @@ -173,7 +173,7 @@ export class CardsCompComp extends CCComp { .start(); } clear_cards(){ - console.log("[CardsComp]:清除卡牌队列") + // console.log("[CardsComp]:清除卡牌队列") this.cardQueue = []; this.close_cards(GameEvent.CardsClose,null) } diff --git a/assets/script/game/map/FightConComp.ts b/assets/script/game/map/FightConComp.ts index cee4aaf2..e3595218 100644 --- a/assets/script/game/map/FightConComp.ts +++ b/assets/script/game/map/FightConComp.ts @@ -4,6 +4,7 @@ import { GameEvent } from '../common/config/GameEvent'; import { geDebuffNum, getBuffNum, BuffAttr, DebuffAttr } from '../common/config/SkillSet'; import { Timer } from 'db://oops-framework/core/common/timer/Timer'; import { FightSet } from '../common/config/Mission'; +import { SuperCards, SuperCardsType } from '../common/config/CardSet'; const { ccclass, property } = _decorator; @ccclass('FightConComp') @@ -38,6 +39,7 @@ export class FightConComp extends Component { oops.message.on(GameEvent.EquipChange,this.equip_change,this) oops.message.on(GameEvent.FightReady,this.fight_ready,this) oops.message.on(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,this.change_equip_special_attr,this) + oops.message.on(GameEvent.UseSpecialCard,this.use_special_card,this) } protected start(): void { @@ -111,6 +113,24 @@ export class FightConComp extends Component { return obj; } + private use_special_card(e:GameEvent,data:any){ + console.log("[FightConComp]:use_special_card:",SuperCards[data.uuid]) + switch(SuperCards[data.uuid].type){ + case SuperCardsType.SPECIAL: + + break + case SuperCardsType.AOE: + + break + case SuperCardsType.BUFF: + + break + case SuperCardsType.DEBUFF: + break + } + } + + private clearAlls() { this.hero_buff=getBuffNum() this.friend_buff=getBuffNum()