From d7b6dd375a373a5b2c9dd0c1a25901c064fe4b68 Mon Sep 17 00:00:00 2001 From: panw Date: Tue, 17 Jun 2025 16:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=89=B9=E6=AE=8A=E5=8A=A0?= =?UTF-8?q?=E6=88=90=20=E7=BB=A7=E7=BB=AD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/script/game/common/config/Equips.ts | 18 ++-- assets/script/game/common/config/Mission.ts | 4 +- assets/script/game/hero/FriendModel.ts | 17 ++-- assets/script/game/hero/FriendModel.ts.meta | 2 +- assets/script/game/hero/Hero.ts | 10 +++ assets/script/game/hero/HeroViewComp.ts | 74 ++++++++++++---- assets/script/game/hero/MasterModel.ts | 35 ++++---- assets/script/game/hero/MasterModel.ts.meta | 2 +- assets/script/game/hero/SkillConComp.ts | 3 + assets/script/game/map/EquipsComp.ts | 98 +++++++++------------ assets/script/game/map/FightConComp.ts | 21 +++-- 11 files changed, 171 insertions(+), 113 deletions(-) diff --git a/assets/script/game/common/config/Equips.ts b/assets/script/game/common/config/Equips.ts index e0c53cdf..a1b18058 100644 --- a/assets/script/game/common/config/Equips.ts +++ b/assets/script/game/common/config/Equips.ts @@ -33,6 +33,8 @@ export enum EquipSpecialAttr { ATK_ADD_FRIEND_ATK=5, //伙伴攻击力增加 ATK_ADD_FRIEND_HP=6, //伙伴生命值增加 ATK_ADD_GLOD=7, //金币增加 + ATK_ADD_MASTER_ATK=8, //主将攻击力增加 + ATK_ADD_MASTER_HP=9, //主将生命值增加 } export enum EquipQuality { WHITE = 1, @@ -52,6 +54,10 @@ export interface EquipAttribute { value: number; // 属性值 target?: EquipAttrTarget; // 属性作用目标（可选） } +export interface EquipSpecialAttrData { + special_attr: EquipSpecialAttr; // 特殊属性 + special_attr_value: number; // 特殊属性值 +} export interface EquipDebuffAttribute { type: DebuffAttr; // 属性类型 value: number; // 属性值 @@ -64,13 +70,13 @@ export interface EquipData { name: string; // 装备名称 type: EquipType; // 装备类型 info: string; // 装备描述 - special_attr: EquipSpecialAttr; // 特殊属性 + special_attr: EquipSpecialAttrData; // 特殊属性 buff: EquipAttribute[]; // 属性加成列表 debuff: EquipDebuffAttribute[]; // 属性减益列表 } export const EquipInfo: { [key: number]: EquipData } = { 2001: {uuid: 2001, name: "新手剑", type: EquipType.WEAPON,info:"攻击力增加80%", - special_attr: EquipSpecialAttr.FRIEND_LIVE_CD, + special_attr: {special_attr:EquipSpecialAttr.FRIEND_LIVE_CD,special_attr_value:3}, buff: [ { type: BuffAttr.ATK, value: 80, target: EquipAttrTarget.HERO }, ], @@ -79,7 +85,7 @@ export const EquipInfo: { [key: number]: EquipData } = { ] }, 2002: {uuid: 2002,name: "新手剑2",type: EquipType.WEAPON,info:"攻击速度增加30%", - special_attr: EquipSpecialAttr.FRIEND_LIVE_CD, + special_attr:{special_attr:EquipSpecialAttr.FRIEND_LIVE_CD,special_attr_value:3}, buff: [ { type: BuffAttr.ATK_CD, value: 30, target: EquipAttrTarget.HERO }, ], @@ -88,7 +94,7 @@ export const EquipInfo: { [key: number]: EquipData } = { ] }, 2003: {uuid: 2003,name: "新手剑3",type: EquipType.WEAPON,info:"攻击次数增加1次", - special_attr: EquipSpecialAttr.FRIEND_LIVE_CD, + special_attr:{special_attr:EquipSpecialAttr.FRIEND_LIVE_CD,special_attr_value:3}, buff: [ { type: BuffAttr.ATK_COUNT, value: 1, target: EquipAttrTarget.HERO }, ], @@ -97,7 +103,7 @@ export const EquipInfo: { [key: number]: EquipData } = { ] }, 2004: {uuid: 2004,name: "防具1",type: EquipType.ARMOR,info:"生命值增加100%", - special_attr: EquipSpecialAttr.FRIEND_LIVE_CD, + special_attr:{special_attr:EquipSpecialAttr.FRIEND_LIVE_CD,special_attr_value:3}, buff: [ { type: BuffAttr.HP, value: 100, target: EquipAttrTarget.HERO }, ], @@ -106,7 +112,7 @@ export const EquipInfo: { [key: number]: EquipData } = { ] }, 2005: {uuid: 2005,name: "防具2",type: EquipType.ARMOR,info:"免伤增加50%", - special_attr: EquipSpecialAttr.FRIEND_LIVE_CD, + special_attr:{special_attr:EquipSpecialAttr.FRIEND_LIVE_CD,special_attr_value:3}, buff: [ { type: BuffAttr.DEF, value: 50, target: EquipAttrTarget.HERO }, ], diff --git a/assets/script/game/common/config/Mission.ts b/assets/script/game/common/config/Mission.ts index 05483209..2ba64c3b 100644 --- a/assets/script/game/common/config/Mission.ts +++ b/assets/script/game/common/config/Mission.ts @@ -55,9 +55,7 @@ export enum FightSet { FRIEND_WAVE_UP=2, //伙伴登场波次 MON_WAVE_TIME=10,//怪物波次时间 FRIEND_LIVE_CD=10,//伙伴复活时间 - FRIEND_LIVE_CD_LESS=2,//伙伴复活时间减少 - ATK_ADD_FRIEND_ATK=4,//伙伴攻击力增加 - ATK_ADD_FRIEND_HP=8,//伙伴生命值增加 + ATK_ADD_FRIEND_COUNT=4,//伙伴攻击力增加 ATK_ADD_GLOD=1,//金币增加 // ATK_TO_ATK_RATIO=0.1, // ATK_TO_HP_RATIO=0.2, diff --git a/assets/script/game/hero/FriendModel.ts b/assets/script/game/hero/FriendModel.ts index 51e0c635..88b57213 100644 --- a/assets/script/game/hero/FriendModel.ts +++ b/assets/script/game/hero/FriendModel.ts @@ -1,23 +1,26 @@ -import { oops } from "db://oops-framework/core/Oops"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { VM } from "../../../../extensions/oops-plugin-framework/assets/libs/model-view/ViewModel"; -import { GameEvent } from "../common/config/GameEvent"; /** 数据层对象 */ @ecs.register('FriendModel') export class FriendModelComp extends ecs.Comp { /** 提供 MVVM 组件使用的数据 */ private vm: any = {}; - onLoad(){ - oops.message.on(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,this.change_equip_special_attr,this) + + /** 显示数据添加到 MVVM 框架中监视 */ + vmAdd() { + VM.add(this.vm, "FriendModel"); } - change_equip_special_attr(e:GameEvent,data:any){ - console.log("[FriendModel]:change_equip_special_attr",data) + /** 显示数据从 MVVM 框架中移除 */ + vmRemove() { + VM.remove("FriendModel"); } /** 数据层组件移除时，重置所有数据为默认值 */ reset() { - + for (var key in this.vm) { + delete this.vm[key]; + } } } \ No newline at end of file diff --git a/assets/script/game/hero/FriendModel.ts.meta b/assets/script/game/hero/FriendModel.ts.meta index 1e4bbe69..cb0a9f0e 100644 --- a/assets/script/game/hero/FriendModel.ts.meta +++ b/assets/script/game/hero/FriendModel.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "8f0b0fe4-fa69-4f5b-95d1-833eaafa2103", + "uuid": "bffcbaf3-0abd-46c9-b297-da0667e9b7f3", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 1516d094..6bbe4c62 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -8,6 +8,8 @@ import { BoxSet, FacSet } from "../common/config/BoxSet"; import { HeroInfo, HeroPos } from "../common/config/heroSet"; import { BattleMoveComp } from "../common/ecs/position/BattleMoveComp"; import { SkillConComp } from "./SkillConComp"; +import { FriendModelComp } from "./FriendModel"; +import { MasterModelComp } from "./MasterModel"; /** 角色实体 */ @ecs.register(`Hero`) @@ -26,6 +28,12 @@ export class Hero extends ecs.Entity { destroy(): void { this.remove(HeroViewComp); this.remove(HeroModelComp); + if(this.get(FriendModelComp)){ + this.remove(FriendModelComp); + } + if(this.get(MasterModelComp)){ + this.remove(MasterModelComp); + } super.destroy(); } hart_load(uuid:number=5004) { @@ -57,6 +65,7 @@ export class Hero extends ecs.Entity { hv.atk_skill=hero.skills[0] console.log(hv.hero_name+"dis=>"+hv.dis) this.add(hv); + this.addComponents(MasterModelComp) } /** 加载角色 */ load(pos: Vec3 = Vec3.ZERO,scale:number = 1,uuid:number=1001,info:any={ap:0,hp:0},fight_pos:number=1) { @@ -88,6 +97,7 @@ export class Hero extends ecs.Entity { hv.hp_up=hero.hp_up hv.atk_skill=hero.skills[0] this.add(hv); + this.addComponents(FriendModelComp); const move = this.get(BattleMoveComp); move.direction = 1; // 向右移动 move.targetX = 800; // 右边界' diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 4edcdd35..fc27db2f 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -13,6 +13,8 @@ import { FightConComp } from "../map/FightConComp"; import { EquipSpecialAttr } from "../common/config/Equips"; import { FightSet } from "../common/config/Mission"; import { HeroPos } from "../common/config/heroSet"; +import { FriendModelComp } from "./FriendModel"; +import { MasterModelComp } from "./MasterModel"; const { ccclass, property } = _decorator; @@ -69,7 +71,7 @@ export class HeroViewComp extends CCComp { atk_count: number = 0; atked_count: number = 0; - + atk_add_count:number=0; stop_cd: number = 0; /*停止倒计时*/ yun_cd: number = 0; //眩晕倒计时 ice_cd: number = 0; //冰冻倒计时 @@ -91,7 +93,8 @@ export class HeroViewComp extends CCComp { this.as = this.getComponent(HeroSpine); this.FIGHTCON=this.node.parent.getComponent(FightConComp); console.log("[HeroViewComp]:hero view comp ",this.FIGHTCON) - this.on(GameEvent.ChangeATK,this.change_atk,this) + this.on(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,this.change_atk,this) + // let anm = this.node.getChildByName("anm") // anm.setScale(anm.scale.x*0.8,anm.scale.y*0.8); } @@ -138,24 +141,18 @@ export class HeroViewComp extends CCComp { this.processDamageQueue(); } - - change_atk(e:GameEvent,data:any){ - switch(data){ - case EquipSpecialAttr.ICE: - this.atk_skill=6001 - break - case EquipSpecialAttr.FIRE: - this.atk_skill=6002 - break - case EquipSpecialAttr.WIND: - this.atk_skill=6003 - break - default: - this.atk_skill=6001 - break + if(data.ice){ + this.atk_skill=6001 + }else if(data.fire){ + this.atk_skill=6002 + }else if(data.wind){ + this.atk_skill=6003 + }else{ + this.atk_skill=6001 } } + get isActive() { return this.ent.has(HeroViewComp) && this.node?.isValid; } @@ -251,7 +248,48 @@ export class HeroViewComp extends CCComp { } } } + master_count_atk_count(){ //主将攻击次数 主要有装备加成,需要单独处理 + if(!this.is_master) return + this.atk_count+=1 + if(this.atk_count< FightSet.ATK_ADD_FRIEND_COUNT) return + if(this.FIGHTCON.atk_add_glod >0) smc.mission.add_gold(this.FIGHTCON.atk_add_glod) + + this.do_friend_atk_add() + this.do_master_atk_add() + this.atk_count=0 + } + friend_count_atk_count(){ //伙伴攻击次数 有装备加成,需要单独处理 + if(this.is_master) return + if(this.atk_add_count==0) return + this.atk_count+=1 + if(this.atk_count < this.atk_add_count) return + } + + do_friend_atk_add(){ + let friends=ecs.query(ecs.allOf(FriendModelComp)) + friends.forEach(friend=>{ + let friend_view=friend.get(HeroViewComp) + if(this.FIGHTCON.atk_add_friend_atk>0) { + friend_view.add_ap(this.FIGHTCON.atk_add_friend_atk) + } + if(this.FIGHTCON.atk_add_friend_hp>0) { + friend_view.add_hp_max(this.FIGHTCON.atk_add_friend_hp) + } + }) + } + do_master_atk_add(){ + let master=ecs.query(ecs.allOf(MasterModelComp)) + master.forEach(master=>{ + let master_view=master.get(HeroViewComp) + if(this.FIGHTCON.atk_add_master_atk>0) { + master_view.add_ap(this.FIGHTCON.atk_add_master_atk) + } + if(this.FIGHTCON.atk_add_master_hp>0) { + master_view.add_hp_max(this.FIGHTCON.atk_add_master_hp) + } + }) + } do_change(){ this.BUFFCOMP.update_info_ap() this.BUFFCOMP.update_info_hp() @@ -266,7 +304,7 @@ export class HeroViewComp extends CCComp { do_dead(){ - this.Friend_alive_cd=new Timer(this.FIGHTCON.Friend_alive_cd) + this.Friend_alive_cd=new Timer(this.FIGHTCON.friend_alive_cd) console.log("[HeroViewComp]:角色死亡",this.hero_uuid) if(this.is_master){ console.log("[HeroViewComp]:英雄死亡") diff --git a/assets/script/game/hero/MasterModel.ts b/assets/script/game/hero/MasterModel.ts index ffe14dd1..cb92fcc4 100644 --- a/assets/script/game/hero/MasterModel.ts +++ b/assets/script/game/hero/MasterModel.ts @@ -1,25 +1,26 @@ -import { _decorator, Component, Node } from 'cc'; -import { GameEvent } from '../common/config/GameEvent'; -import { oops } from 'db://oops-framework/core/Oops'; -import { ecs } from 'db://oops-framework/libs/ecs/ECS'; -const { ccclass, property } = _decorator; +import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; +import { VM } from "../../../../extensions/oops-plugin-framework/assets/libs/model-view/ViewModel"; +/** 数据层对象 */ @ecs.register('MasterModel') export class MasterModelComp extends ecs.Comp { + /** 提供 MVVM 组件使用的数据 */ + private vm: any = {}; - onLoad(){ - oops.message.on(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,this.change_equip_special_attr,this) + /** 显示数据添加到 MVVM 框架中监视 */ + vmAdd() { + VM.add(this.vm, "MasterModel"); } - change_equip_special_attr(e:GameEvent,data:any){ - console.log("[MasterModel]:change_equip_special_attr",data) + /** 显示数据从 MVVM 框架中移除 */ + vmRemove() { + VM.remove("MasterModel"); } - update(deltaTime: number) { - - } - reset(): void { - - } -} - + /** 数据层组件移除时，重置所有数据为默认值 */ + reset() { + for (var key in this.vm) { + delete this.vm[key]; + } + } +} \ No newline at end of file diff --git a/assets/script/game/hero/MasterModel.ts.meta b/assets/script/game/hero/MasterModel.ts.meta index ab04b6ee..f8ce0229 100644 --- a/assets/script/game/hero/MasterModel.ts.meta +++ b/assets/script/game/hero/MasterModel.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "70abe143-ca41-4c22-b645-63a6035aba95", + "uuid": "8b5cf0cb-bab1-4084-bfe5-21fc74914b2f", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/hero/SkillConComp.ts b/assets/script/game/hero/SkillConComp.ts index ba9e7743..4ce0e72d 100644 --- a/assets/script/game/hero/SkillConComp.ts +++ b/assets/script/game/hero/SkillConComp.ts @@ -47,9 +47,12 @@ export class SkillConComp extends CCComp { if (!config) return; // console.log(this.HeroView.hero_name+(this.HeroView.is_master?"[主]":"[从] 释放")+"=>"+config.name+"=>"+count) this.castSkill(config,count); + this.HeroView.master_count_atk_count() + this.HeroView.friend_count_atk_count() this.HeroView.at = 0; } } + get_cd(cd:number,view:HeroViewComp){ if(view.fac==FacSet.HERO){ if(view.is_master){ diff --git a/assets/script/game/map/EquipsComp.ts b/assets/script/game/map/EquipsComp.ts index a07de64d..b80c0f9e 100644 --- a/assets/script/game/map/EquipsComp.ts +++ b/assets/script/game/map/EquipsComp.ts @@ -122,9 +122,9 @@ export class EquipsComp extends Component { let weapon_debuffs = this.weapon.uuid ? EquipInfo[this.weapon.uuid]?.debuff || [] : []; let armor_debuffs = this.armor.uuid ? EquipInfo[this.armor.uuid]?.debuff || [] : []; let accessory_debuffs = this.accessory.uuid ? EquipInfo[this.accessory.uuid]?.debuff || [] : []; - let weapon_special_attr = this.weapon.uuid ? EquipInfo[this.weapon.uuid]?.special_attr : 0; - let armor_special_attr = this.armor.uuid ? EquipInfo[this.armor.uuid]?.special_attr : 0; - let accessory_special_attr = this.accessory.uuid ? EquipInfo[this.accessory.uuid]?.special_attr : 0; + let weapon_special_attr = this.weapon.uuid ? EquipInfo[this.weapon.uuid]?.special_attr : null; + let armor_special_attr = this.armor.uuid ? EquipInfo[this.armor.uuid]?.special_attr : null; + let accessory_special_attr = this.accessory.uuid ? EquipInfo[this.accessory.uuid]?.special_attr : null; console.log("武器特殊属性", weapon_special_attr); console.log("防具特殊属性", armor_special_attr); @@ -135,8 +135,9 @@ export class EquipsComp extends Component { console.log("武器减益", weapon_debuffs); console.log("防具减益", armor_debuffs); console.log("饰品减益", accessory_debuffs); + const all_special_attr=[weapon_special_attr,armor_special_attr,accessory_special_attr] - let equip_special_attr=this.count_equip_special_attr(weapon_special_attr,armor_special_attr,accessory_special_attr) + let equip_special_attr=this.count_equip_special_attr(all_special_attr) oops.message.dispatchEvent(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,equip_special_attr) // 合并所有装备属性 @@ -181,65 +182,54 @@ export class EquipsComp extends Component { oops.message.dispatchEvent(GameEvent.EquipChange, this.attrs); } - count_equip_special_attr(weapon_special_attr:any,armor_special_attr:any,accessory_special_attr:any){ + count_equip_special_attr(all_special_attr:any[]){ //特殊属性附加 let equip_special_attr={ + ice:false, + fire:false, + wind:false, friend_live_cd_less:0, atk_add_friend_atk:0, atk_add_friend_hp:0, atk_add_glod:0, + atk_add_master_atk:0, + atk_add_master_hp:0, } - switch(weapon_special_attr){ - case EquipSpecialAttr.ICE: - oops.message.dispatchEvent(GameEvent.ChangeATK,EquipSpecialAttr.ICE) - break - case EquipSpecialAttr.FIRE: - oops.message.dispatchEvent(GameEvent.ChangeATK,EquipSpecialAttr.FIRE) - break - case EquipSpecialAttr.WIND: - oops.message.dispatchEvent(GameEvent.ChangeATK,EquipSpecialAttr.WIND) - break - case EquipSpecialAttr.FRIEND_LIVE_CD: - equip_special_attr.friend_live_cd_less+=FightSet.FRIEND_LIVE_CD_LESS - break - case EquipSpecialAttr.ATK_ADD_FRIEND_ATK: - equip_special_attr.atk_add_friend_atk+=FightSet.ATK_ADD_FRIEND_ATK - break - case EquipSpecialAttr.ATK_ADD_FRIEND_HP: - equip_special_attr.atk_add_friend_hp+=FightSet.ATK_ADD_FRIEND_HP - break - case EquipSpecialAttr.ATK_ADD_GLOD: - equip_special_attr.atk_add_glod+=FightSet.ATK_ADD_GLOD - } + all_special_attr.forEach(special_attr=>{ + if(special_attr){ + switch(special_attr.special_attr){ + case EquipSpecialAttr.ICE: + equip_special_attr.ice=true + break + case EquipSpecialAttr.FIRE: + equip_special_attr.fire=true + break + case EquipSpecialAttr.WIND: + equip_special_attr.wind=true + break + case EquipSpecialAttr.FRIEND_LIVE_CD: + equip_special_attr.friend_live_cd_less+=special_attr.special_attr_value + break + case EquipSpecialAttr.ATK_ADD_FRIEND_ATK: + equip_special_attr.atk_add_friend_atk+=special_attr.special_attr_value + break + case EquipSpecialAttr.ATK_ADD_FRIEND_HP: + equip_special_attr.atk_add_friend_hp+=special_attr.special_attr_value + break + case EquipSpecialAttr.ATK_ADD_GLOD: + equip_special_attr.atk_add_glod+=special_attr.special_attr_value + break + case EquipSpecialAttr.ATK_ADD_MASTER_ATK: + equip_special_attr.atk_add_master_atk+=special_attr.special_attr_value + break + case EquipSpecialAttr.ATK_ADD_MASTER_HP: + equip_special_attr.atk_add_master_hp+=special_attr.special_attr_value + break + } + } + }) - switch(armor_special_attr){ - case EquipSpecialAttr.FRIEND_LIVE_CD: - equip_special_attr.friend_live_cd_less+=FightSet.FRIEND_LIVE_CD_LESS - break - case EquipSpecialAttr.ATK_ADD_FRIEND_ATK: - equip_special_attr.atk_add_friend_atk+=FightSet.ATK_ADD_FRIEND_ATK - break - case EquipSpecialAttr.ATK_ADD_FRIEND_HP: - equip_special_attr.atk_add_friend_hp+=FightSet.ATK_ADD_FRIEND_HP - break - case EquipSpecialAttr.ATK_ADD_GLOD: - equip_special_attr.atk_add_glod+=FightSet.ATK_ADD_GLOD - } - - switch(accessory_special_attr){ - case EquipSpecialAttr.FRIEND_LIVE_CD: - equip_special_attr.friend_live_cd_less+=FightSet.FRIEND_LIVE_CD_LESS - break - case EquipSpecialAttr.ATK_ADD_FRIEND_ATK: - equip_special_attr.atk_add_friend_atk+=FightSet.ATK_ADD_FRIEND_ATK - break - case EquipSpecialAttr.ATK_ADD_FRIEND_HP: - equip_special_attr.atk_add_friend_hp+=FightSet.ATK_ADD_FRIEND_HP - break - case EquipSpecialAttr.ATK_ADD_GLOD: - equip_special_attr.atk_add_glod+=FightSet.ATK_ADD_GLOD - } console.log("[EquipsComp]:equip_special_attr",equip_special_attr) return equip_special_attr } diff --git a/assets/script/game/map/FightConComp.ts b/assets/script/game/map/FightConComp.ts index ef2aff6d..cee4aaf2 100644 --- a/assets/script/game/map/FightConComp.ts +++ b/assets/script/game/map/FightConComp.ts @@ -25,7 +25,13 @@ export class FightConComp extends Component { temp_friend_debuff = this.getInitTempDebuff(); temp_enemy_debuff = this.getInitTempDebuff(); atk_type:number=0; - Friend_alive_cd:number=FightSet.FRIEND_LIVE_CD + + friend_alive_cd:number=FightSet.FRIEND_LIVE_CD + atk_add_friend_atk:number=0 + atk_add_friend_hp:number=0 + atk_add_glod:number=0 + atk_add_master_atk:number=0 + atk_add_master_hp:number=0 onLoad(){ // console.log("fight con start") @@ -35,17 +41,20 @@ export class FightConComp extends Component { } protected start(): void { - this.Friend_alive_cd=FightSet.FRIEND_LIVE_CD + this.friend_alive_cd=FightSet.FRIEND_LIVE_CD } change_equip_special_attr(e:GameEvent,data:any){ console.log("[FightConComp]:change_equip_special_attr",data) - this.up_friend_alive_cd(data.friend_live_cd_less) + this.atk_add_friend_atk=data.atk_add_friend_atk + this.atk_add_friend_hp=data.atk_add_friend_hp + this.atk_add_glod=data.atk_add_glod + this.atk_add_master_atk=data.atk_add_master_atk + this.atk_add_master_hp=data.atk_add_master_hp + this.friend_alive_cd=FightSet.FRIEND_LIVE_CD-data.friend_live_cd_less } - up_friend_alive_cd(less:number){ - this.Friend_alive_cd=FightSet.FRIEND_LIVE_CD-less - } + private equip_change(e:GameEvent,equip:any){ this.hero_buff=equip.hero_buff