diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 25319e7b..69a3b354 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -7661,7 +7661,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 90.73828125, + "width": 41.841796875, "height": 35.5 }, "_anchorPoint": { @@ -7697,7 +7697,7 @@ "b": 255, "a": 255 }, - "_string": "{{0:kmbt}}", + "_string": "{{0}}", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 20, diff --git a/assets/script/game/common/config/TalentSet.ts b/assets/script/game/common/config/TalentSet.ts index d23661ca..aa974ace 100644 --- a/assets/script/game/common/config/TalentSet.ts +++ b/assets/script/game/common/config/TalentSet.ts @@ -27,7 +27,7 @@ export interface TalentConfig { * | 2 | 暴击强化 | +25% | BuffAttr.CRITICAL | 暴击率加成 | * | 3 | 暴击伤害强化 | +50% | BuffAttr.CRITICAL_DMG| 暴击伤害加成 | * | 4 | 闪避强化 | +15% | BuffAttr.DODGE | 闪避率加成 | - * | 5 | 多重攻击 | +1次,伤害减40% | BuffAttr.DEBUFF_COUNT| 攻击次数增加 | + * | 5 | 多重攻击 | +1次,伤害减40% | BuffAttr.WFUNY| 攻击次数增加 | * | 6 | 生命强化 | +100% | BuffAttr.HP | 生命值百分比加成 | * | 7 | 免伤强化 | +15% | BuffAttr.DEF | 免伤百分比加成 | * | 8 | 穿透强化 | +1层 | BuffAttr.PUNCTURE | 普通攻击穿透层数 | @@ -57,7 +57,7 @@ export const TalentList: { [key: number]: TalentConfig } = { 1002: {uuid:1002,name:"暴击强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.CRITICAL,value:15,info:"暴击率+15%"}, 1003: {uuid:1003,name:"暴击伤害强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.CRITICAL_DMG,value:30,info:"暴击伤害+30%"}, 1004: {uuid:1004,name:"闪避强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.DODGE,value:9,info:"闪避率+9%"}, - 1005: {uuid:1005,name:"多重攻击",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.DEBUFF_COUNT,value:1,info:"攻击次数+1，伤害减60%"}, + 1005: {uuid:1005,name:"多重攻击",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.WFUNY,value:20,info:"额外攻击概率+10%"}, 1006: {uuid:1006,name:"生命强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.HP,value:60,info:"生命值+60%"}, 1007: {uuid:1007,name:"免伤强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.DEF,value:9,info:"免伤+9%"}, 1008: {uuid:1008,name:"穿透强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.PUNCTURE,value:1,info:"普通攻击穿透+1"}, @@ -66,15 +66,14 @@ export const TalentList: { [key: number]: TalentConfig } = { 1011: {uuid:1011,name:"冰冻强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.FROST_RATIO,value:6,info:"冰冻概率+6%"}, 1012: {uuid:1012,name:"击退强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.KNOCKBACK,value:6,info:"击退概率+6%"}, 1013: {uuid:1013,name:"击晕强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.STUN_RATTO,value:6,info:"击晕概率+6%"}, - 1014: {uuid:1014,name:"反伤强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.REFLECT,value:12,info:"反伤+12%"}, - 1015: {uuid:1015,name:"吸血强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.LIFESTEAL,value:12,info:"吸血+12%"}, + 1014: {uuid:1015,name:"吸血强化",path:"3063",quality:TalentQuality.BLUE,buffType:BuffAttr.LIFESTEAL,value:12,info:"吸血+12%"}, // ==================== 紫色品质天赋 ==================== 2001: {uuid:2001,name:"攻击大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.ATK,value:50,info:"攻击力+50%"}, 2002: {uuid:2002,name:"暴击大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.CRITICAL,value:25,info:"暴击率+25%"}, 2003: {uuid:2003,name:"暴击伤害大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.CRITICAL_DMG,value:50,info:"暴击伤害+50%"}, 2004: {uuid:2004,name:"闪避大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.DODGE,value:15,info:"闪避率+15%"}, - 2005: {uuid:2005,name:"多重攻击大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.DEBUFF_COUNT,value:1,info:"攻击次数+1，伤害减40%"}, + 2005: {uuid:2005,name:"多重攻击大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.WFUNY,value:30,info:"额外攻击概率+30%"}, 2006: {uuid:2006,name:"生命大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.HP,value:100,info:"生命值+100%"}, 2007: {uuid:2007,name:"免伤大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.DEF,value:15,info:"免伤+15%"}, 2008: {uuid:2008,name:"穿透大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.PUNCTURE,value:1,info:"普通攻击穿透+1"}, @@ -83,8 +82,7 @@ export const TalentList: { [key: number]: TalentConfig } = { 2011: {uuid:2011,name:"冰冻大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.FROST_RATIO,value:10,info:"冰冻概率+10%"}, 2012: {uuid:2012,name:"击退大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.KNOCKBACK,value:10,info:"击退概率+10%"}, 2013: {uuid:2013,name:"击晕大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.STUN_RATTO,value:10,info:"击晕概率+10%"}, - 2014: {uuid:2014,name:"反伤大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.REFLECT,value:20,info:"反伤+20%"}, - 2015: {uuid:2015,name:"吸血大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.LIFESTEAL,value:20,info:"吸血+20%"}, + 2014: {uuid:2015,name:"吸血大师",path:"3063",quality:TalentQuality.PURPLE,buffType:BuffAttr.LIFESTEAL,value:20,info:"吸血+20%"}, }; // 获取天赋配置 diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index cd2b4669..d5b52706 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -92,7 +92,6 @@ export class Hero extends ecs.Entity { hv.cd = hv.cd_base = hero.cd hv.hp= hv.hp_max = hv.hp_base=hero.hp+info.hp hv.ap = hv.ap_base=hero.ap+info.ap; - hv.def =hero.def+info.def; hero.buff.forEach((buff:any)=>{ switch(buff.buff_type){ case BuffAttr.CRITICAL: @@ -110,12 +109,6 @@ export class Hero extends ecs.Entity { case BuffAttr.CRITICAL_NO: hv.crit_no=buff.value break - case BuffAttr.BURN_COUNT: - hv.burn_count=buff.value - break - case BuffAttr.BURN_VALUE: - hv.burn_value=buff.value - break case BuffAttr.PUNCTURE: hv.puncture=buff.value break @@ -137,17 +130,14 @@ export class Hero extends ecs.Entity { case BuffAttr.ATK: hv.ap=hv.ap*(100+buff.value)/100 break - case BuffAttr.STUN_TIME: - hv.stun_time=buff.value - break case BuffAttr.STUN_RATTO: hv.stun_ratto=buff.value break case BuffAttr.FROST_RATIO: hv.frost_ratto=buff.value break - case BuffAttr.FROST_TIME: - hv.frost_time=buff.value + case BuffAttr.KNOCKBACK: + hv.knockback=buff.value break case BuffAttr.POWER_UP: smc.vmdata.hero.POWER_UP+=buff.value diff --git a/assets/script/game/hero/HeroConComp.ts b/assets/script/game/hero/HeroConComp.ts index 1f750376..4b7a6892 100644 --- a/assets/script/game/hero/HeroConComp.ts +++ b/assets/script/game/hero/HeroConComp.ts @@ -67,6 +67,7 @@ export class HeroConComp extends CCComp { case BuffAttr.CRITICAL_DMG: this.heroView.change_crit_d(buff.value) break + } } } @@ -145,12 +146,12 @@ export class HeroConComp extends CCComp { case BuffAttr.STUN_RATTO: this.heroView.change_stun_ratto(tal.value) break - case BuffAttr.REFLECT: - this.heroView.change_reflect(tal.value) - break case BuffAttr.LIFESTEAL: this.heroView.change_lifesteal(tal.value) break + case BuffAttr.WFUNY: + this.heroView.change_wfuny(tal.value) + break } } remove_talent_card(e:GameEvent,data:any){ diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 86ce0e20..0e1c86a2 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -164,6 +164,7 @@ export class HeroViewComp extends CCComp { start () { this.as.idle() this.BUFFCOMP=this.node.getComponent(BuffComp); + if(this.is_master) this.BUFFCOMP.vmdata_update() /** 方向 */ this.node.setScale(this.scale,1); this.node.getChildByName("top").setScale(this.scale,1); @@ -231,6 +232,11 @@ export class HeroViewComp extends CCComp { if(this.shield>6) this.shield=6 if(this.shield>0) this.BUFFCOMP.show_shield(true) } + change_wfuny(wfuny: number){ + this.wfuny+=wfuny + if(this.wfuny<0) this.wfuny=0 + if(this.is_master) this.BUFFCOMP.vmdata_update() + } change_puncture(puncture: number){ this.puncture+=puncture if(this.puncture<1) this.puncture=1 diff --git a/assets/script/game/hero/SkillConComp.ts b/assets/script/game/hero/SkillConComp.ts index 30369977..c31af57a 100644 --- a/assets/script/game/hero/SkillConComp.ts +++ b/assets/script/game/hero/SkillConComp.ts @@ -167,7 +167,7 @@ export class SkillConComp extends CCComp { this.scheduleOnce(()=>{ this.HeroView.ex_show("blue") this.doSkill(config,false,dmg) - },0.05) + },0.1) } // 保存定时器ID this._timers[`skill_${config.uuid}`] = timerId;