dd

assets/script/game/Role/Role.ts

@@ -55,15 +55,19 @@ export class Role extends ecs.Entity {
         rv.hero_uuid=uuid;
         rv.speed =rv.ospeed = role.speed;
         rv.hero_name= "role";
-        rv.hp= rv.hp_max = role.hp;
+        rv.hp= rv.hp_max = role.hp*(1+smc.vm_data.talent[1].bonus*smc.vm_data.talent[1].lv);
         rv.level = role.lv;
-        rv.atk = role.atk;
-        rv.atk_cd = role.atk_cd;
+        rv.atk = role.atk*(1+smc.vm_data.talent[2].bonus*smc.vm_data.talent[2].lv);
+        rv.atk_cd = role.atk_cd*(1-smc.vm_data.talent[3].bonus*smc.vm_data.talent[3].lv);
+        rv.st_boncus=1+smc.vm_data.talent[15].bonus*smc.vm_data.talent[15].lv;
+        rv.s_boncus=1+smc.vm_data.talent[16].bonus*smc.vm_data.talent[16].lv;
         rv.power = role.power;
         rv.skills = role.skills;  
-        rv.skill = role.skill;        
-        rv.atk_range=role.atk_range;
-        rv.power= role.power;
+        for (let i = 0; i < rv.skills.length; i++) {
+            rv.skills[i].cd*(1-smc.vm_data.talent[4].bonus*smc.vm_data.talent[4].lv)
+        }
+        rv.skill = role.skill;
+        rv.box_group = BoxSet.HERO;        
         this.add(rv);
     }
     move(target: Vec3) {

assets/script/game/Role/RoleViewComp.ts

@@ -59,6 +59,8 @@ export class RoleViewComp extends CCComp {
     power_speed: number = 1; //能量回复速度每0.1秒回复量
     skill:8001;
     skills:any=[]
+    st_boncus: number = 1;  //技能持续时间加成
+    s_boncus: number = 1;  //技能效果加成
     buff_atks:any = [];
     buff_atk:number = 0;
 
@@ -130,6 +132,8 @@ export class RoleViewComp extends CCComp {
                     
                     selfCollider.node.setSiblingIndex(otherCollider.node.getSiblingIndex()+1)
                     // console.log("onPreSolve b:"+selfCollider.node.uuid+":"+selfCollider.node.getSiblingIndex()+"/"+otherCollider.node.uuid+":"+otherCollider.node.getSiblingIndex());
+                }else{
+                    selfCollider.node.setSiblingIndex(otherCollider.node.getSiblingIndex()-1)
                 }
 
             }
@@ -158,6 +162,9 @@ export class RoleViewComp extends CCComp {
     
 
     update(dt: number){
+        if(smc.vm_data.game_over||smc.vm_data.game_pause){
+            return
+        }
         if (this.timer.update(dt)) {
 
         }
@@ -236,7 +243,7 @@ export class RoleViewComp extends CCComp {
             pos.y=300
             t_pos.y=t_pos.y-300
         }
-        skill.load(pos,BoxSet.HERO,this.node,skill_uuid,atk,t_pos);
+        skill.load(pos,this.box_group,this.node,skill_uuid,atk,t_pos);
         // this.tooltip(3,smc.skills[skill_uuid].name,this.skill_uuid);
     }
     //使用max_skill
@@ -274,8 +281,8 @@ export class RoleViewComp extends CCComp {
             this.atk_time = 0;
             this.as.atk();
             this.scheduleOnce(()=>{
-                this.shoot(this.skill,-30);
-            },0.2)
+                this.shoot(this.skill,-30,45);
+            },0.3)
         }
     }
 
@@ -306,6 +313,13 @@ export class RoleViewComp extends CCComp {
     }
     heathed(){
         this.node.getChildByName("heathed").active=true
+        // console.log("role heathed");
+        // var path =  "game/skills/heathed";
+        // var prefab: Prefab = oops.res.get(path, Prefab)!;
+        // var node = instantiate(prefab);
+        // let pos = v3(0,0)
+        // node.setPosition(pos)
+        // node.parent = this.node;
     }
     add_hp(hp: number=0){
         this.heathed();