dd

2025-09-01 17:27:24 +08:00
parent da0237d49c
commit 8e044fcf3c
9 changed files with 6650 additions and 5553 deletions
--- a/assets/resources/game/gui/sk_icon.prefab
+++ b/assets/resources/game/gui/sk_icon.prefab
@@ -612,7 +612,7 @@
      "__id__": 1
    },
    "_children": [],
-    "_active": false,
+    "_active": true,
    "_components": [
      {
        "__id__": 27
@@ -626,8 +626,8 @@
    },
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": 77.006,
-      "y": 82.14,
+      "x": 52.969,
+      "y": 58.103,
      "z": 0
    },
    "_lrot": {
@@ -639,8 +639,8 @@
    },
    "_lscale": {
      "__type__": "cc.Vec3",
-      "x": 1.5,
-      "y": 1.5,
+      "x": 1,
+      "y": 1,
      "z": 1
    },
    "_mobility": 0,
--- a/assets/resources/gui/Hinfo.prefab
+++ b/assets/resources/gui/Hinfo.prefab
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
--- a/assets/script/game/common/SingletonModuleComp.ts
+++ b/assets/script/game/common/SingletonModuleComp.ts
@@ -54,7 +54,6 @@ export class SingletonModuleComp extends ecs.Comp {
    heros:any = {
        5001:{uuid:5001,lv:1},
        5005:{uuid:5005,lv:1},
-        5007:{uuid:5007,lv:1},
    };
    items:any={
    }
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -462,25 +462,25 @@ export const SkillSet: Record<number, SkillConfig> = {
    },
    // ==========增强型技能,被动技能,========== 6300-6399
    6301: {
-        uuid:6301,name:"攻击生命强化Ⅰ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3101",quality:QualitySet.ORANGE,TType:TType.Frontline,
+        uuid:6301,name:"攻击生命强化Ⅰ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3065",quality:QualitySet.ORANGE,TType:TType.Frontline,
        TGroup:TGroup.Ally,SType:SType.buff,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.fixedEnd,EType:EType.animationEnd,
        ap:100,cd:5,in:0,hit_num:1,hit:1,hited:0.3,speed:720,cost:10,fname:"max",flash:false,with:90,maxC:1,
        buffs:[{buff:BuffAttr.AP,buV:20,buC:0,buR:100},{buff:BuffAttr.HP,buV:20,buC:0,buR:100}],debuffs:[],info:"增加20%攻击力和生命值"
    },
    6302: {
-        uuid:6302,name:"攻击生命强化Ⅱ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3101",quality:QualitySet.ORANGE,TType:TType.Frontline,
+        uuid:6302,name:"攻击生命强化Ⅱ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3093",quality:QualitySet.ORANGE,TType:TType.Frontline,
        TGroup:TGroup.Ally,SType:SType.buff,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.fixedEnd,EType:EType.animationEnd,
        ap:100,cd:5,in:0,hit_num:1,hit:1,hited:0.3,speed:720,cost:10,fname:"max",flash:false,with:90,maxC:1,
        buffs:[{buff:BuffAttr.AP,buV:40,buC:0,buR:100},{buff:BuffAttr.HP,buV:40,buC:0,buR:100}],debuffs:[],info:"增加40%攻击力和生命值"
    },
    6303: {
-        uuid:6303,name:"攻击生命强化Ⅲ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3101",quality:QualitySet.ORANGE,TType:TType.Frontline,
+        uuid:6303,name:"攻击生命强化Ⅲ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3065",quality:QualitySet.ORANGE,TType:TType.Frontline,
        TGroup:TGroup.Ally,SType:SType.buff,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.fixedEnd,EType:EType.animationEnd,
        ap:100,cd:5,in:0,hit_num:1,hit:1,hited:0.3,speed:720,cost:10,fname:"max",flash:false,with:90,maxC:1,
        buffs:[{buff:BuffAttr.AP,buV:60,buC:0,buR:100},{buff:BuffAttr.HP,buV:60,buC:0,buR:100}],debuffs:[],info:"增加60%攻击力和生命值"
    },
    6304: {
-        uuid:6304,name:"攻击生命强化Ⅳ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3101",quality:QualitySet.ORANGE,TType:TType.Frontline,
+        uuid:6304,name:"攻击生命强化Ⅳ",for_hero:true,sp_name:"max_ap",AtkedType:AtkedType.atked,path:"3065",quality:QualitySet.ORANGE,TType:TType.Frontline,
        TGroup:TGroup.Ally,SType:SType.buff,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.fixedEnd,EType:EType.animationEnd,
        ap:100,cd:5,in:0,hit_num:1,hit:1,hited:0.3,speed:720,cost:10,fname:"max",flash:false,with:90,maxC:1,
        buffs:[{buff:BuffAttr.AP,buV:80,buC:0,buR:100},{buff:BuffAttr.HP,buV:80,buC:0,buR:100}],debuffs:[],info:"增加80%攻击力和生命值"
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -96,45 +96,38 @@ export const MonSet = {
 export const HeroInfo = {
   //主将
   5001:{uuid:5001,name:"火焰骑士",path:"hk1", fac:FacSet.HERO,  quality:QualitySet.GREEN,lv:1,kind:1,
-      type:HType.warrior,hp:100,ap:15,dis:100,cd:1,speed:150,skills:[6001,6001],
+      type:HType.warrior,hp:100,ap:15,dis:100,cd:1,speed:150,skills:[6001,6001,6301,6302,6303],
      buff:[],info:""},

   5002:{uuid:5002,name:"刺客",path:"hc1", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:1,
-      type:HType.warrior,hp:100,ap:15,dis:100,cd:1,speed:150,skills:[6001,6001],
+      type:HType.warrior,hp:100,ap:15,dis:100,cd:1,speed:150,skills:[6001,6001,6301,6302,6303],
      buff:[],info:""},

-//    5003:{uuid:5003,name:"碎颅.赫克托",path:"k4",   quality:QualitySet.BLUE,lv:1,kind:1,
-//       type:HType.warrior,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6010,6021,6001],
+  
+   5005:{uuid:5005,name:"绿箭",path:"ha1", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
+      type:HType.remote,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6003,6003,6301,6302,6303],
+      buff:[],info:""},
+
+      
+   5007:{uuid:5007,name:"牧师",path:"hmh1", fac:FacSet.HERO,  quality:QualitySet.PURPLE,lv:1,kind:2,
+      type:HType.mage,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6004,6004,6301,6302,6303],
+      buff:[],info:""},
+      
+   5008:{uuid:5008,name:"火女",path:"hmf1", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
+      type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:100,skills:[6005,6005,6301,6302,6303],
+      buff:[],info:""},
+      
+//    5009:{uuid:5009,name:"风暴精灵",path:"hk1", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
+//       type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:100,skills:[6006,6006,6301,6302,6303],
 //       buff:[],info:""},
      
-//    5004:{uuid:5004,name:"裂伤.塔米拉",path:"k3",   quality:QualitySet.BLUE,lv:1,kind:1,
-//       type:HType.warrior,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6010,6021,6001],
+//    5010:{uuid:5010,name:"战争祭祀",path:"hk1", fac:FacSet.HERO,  quality:QualitySet.ORANGE,lv:1,kind:2,
+//       type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:100,skills:[6007,6007,6301,6302,6303],
 //       buff:[],info:""},
      
-   5005:{uuid:5005,name:"ha1",path:"ha1", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
-      type:HType.remote,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6003,6003],
-      buff:[],info:""},
-
-      
-   5007:{uuid:5007,name:"mh1",path:"hmh1", fac:FacSet.HERO,  quality:QualitySet.PURPLE,lv:1,kind:2,
-      type:HType.mage,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6004],
-      buff:[],info:""},
-      
-   5008:{uuid:5008,name:"",path:"hmf1", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
-      type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:100,skills:[6005],
-      buff:[],info:""},
-      
-   5009:{uuid:5009,name:"风暴精灵",path:"hk1", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
-      type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:100,skills:[6006],
-      buff:[],info:""},
-      
-   5010:{uuid:5010,name:"战争祭祀",path:"hk1", fac:FacSet.HERO,  quality:QualitySet.ORANGE,lv:1,kind:2,
-      type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:100,skills:[6007],
-      buff:[],info:""},
-      
-   5011:{uuid:5011,name:"ha2",path:"ha2", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
-      type:HType.remote,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6003],
-      buff:[],info:""},
+//    5011:{uuid:5011,name:"ha2",path:"ha2", fac:FacSet.HERO,  quality:QualitySet.BLUE,lv:1,kind:2,
+//       type:HType.remote,hp:100,ap:15,dis:400,cd:1,speed:100,skills:[6003,6003,6301,6302,6303],
+//       buff:[],info:""},


    //怪物
--- a/assets/script/game/hero/Hero.ts
+++ b/assets/script/game/hero/Hero.ts
@@ -8,7 +8,7 @@ import { BoxSet, FacSet } from "../common/config/BoxSet";
 import { getHeroStatsByLevel, HeroInfo, HeroPos, HType } from "../common/config/heroSet";
 import { BattleMoveComp } from "../common/ecs/position/BattleMoveComp";
 import { GameEvent } from "../common/config/GameEvent";
-import { BuffAttr, getBuffNum, SkillSet } from "../common/config/SkillSet";
+import { BuffAttr, getBuffNum, SkillSet, SType } from "../common/config/SkillSet";
 import { FightSet } from "../common/config/Mission";
 import { Skill } from "../skills/Skill";
 /** 角色实体 */
@@ -87,12 +87,20 @@ export class Hero extends ecs.Entity {
            hv.apply_buff(buff.type,buff.value)
        })
        for(let i=0;i<hero.skills.length;i++){
+            if(SkillSet[hero.skills[i]].SType==SType.buff){
+                let buffs=SkillSet[hero.skills[i]].buffs
+                buffs.forEach((buff:any)=>{
+                    hv.apply_buff(buff.buff, buff.buV)
+                })
+                continue
+            }else{
                hv.skills.push({
                    cd:0,
                    uuid:hero.skills[i],
                    cd_max:i==0?hero.cd:SkillSet[hero.skills[i]].cd
                })
            }
+        }
        return hv
    }
 }
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -404,6 +404,7 @@ export class HeroViewComp extends CCComp {
    }
    // 应用buff,有基础值的需要特殊处理,其他的直接加减
    apply_buff(buff_type:number,buff_value:number){
+        console.log("[HeroViewComp]:apply_buff",buff_type,buff_value)
        switch(buff_type){
            case BuffAttr.ATK:  //攻击百分比  
                this.Attrs[BuffAttr.AP]+=Math.floor(buff_value/100*this.ap)
--- a/assets/script/game/map/SIconComp.ts
+++ b/assets/script/game/map/SIconComp.ts
@@ -18,7 +18,7 @@ export class SIconCompComp extends CCComp {

    update_data(s_uuid:number){
        let skill_data = SkillSet[s_uuid]
-        this.node.getChildByName("icon").getComponent(Sprite).spriteFrame = oops.res.get("game/skills/"+skill_data.path, SpriteFrame)
+        this.node.getChildByName("icon").getComponent(Sprite).spriteFrame = oops.res.get("game/heros/cards/"+skill_data.path, SpriteFrame)
    }

    /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */