战斗技能转buff 完成 todo 商品改单个， 奖励改图标数量

assets/resources/game/heros/uiheros/a1.prefab

@@ -310,7 +310,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "Idle Blinking",
+    "defaultAnimation": "Walking",
     "_premultipliedAlpha": true,
     "_timeScale": 0.7,
     "_preCacheMode": 0,

assets/resources/game/heros/uiheros/a2.prefab

@@ -310,7 +310,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "Idle Blinking",
+    "defaultAnimation": "Walking",
     "_premultipliedAlpha": true,
     "_timeScale": 0.7,
     "_preCacheMode": 0,

assets/resources/game/heros/uiheros/a3.prefab

@@ -310,7 +310,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "Idle Blinking",
+    "defaultAnimation": "Walking",
     "_premultipliedAlpha": true,
     "_timeScale": 0.7,
     "_preCacheMode": 0,

assets/resources/game/heros/uiheros/k1.prefab

@@ -307,7 +307,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "Idle Blink",
+    "defaultAnimation": "Walking",
     "_premultipliedAlpha": true,
     "_timeScale": 0.7,
     "_preCacheMode": 0,

assets/resources/game/heros/uiheros/k2.prefab

@@ -310,7 +310,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "Idle Blink",
+    "defaultAnimation": "Walking",
     "_premultipliedAlpha": true,
     "_timeScale": 0.7,
     "_preCacheMode": 0,

assets/resources/game/heros/uiheros/k3.prefab

@@ -310,7 +310,7 @@
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "Idle Blink",
+    "defaultAnimation": "Walking",
     "_premultipliedAlpha": true,
     "_timeScale": 0.7,
     "_preCacheMode": 0,

assets/script/game/common/SingletonModuleComp.ts

@@ -108,8 +108,8 @@ export class SingletonModuleComp extends ecs.Comp {
             def:0,
             crit:0,
             dodge:0,
-           
             dead:0,
+            
             mhp:0,
             map:0,
             mdef:0,

assets/script/game/common/config/MissionSet.ts

@@ -25,11 +25,12 @@ export const MissionReward = {
     3:[1001,1002,1003,1004,1005,1006,1021,1022,1023,1024,1025,1026,1027,1028],
 }
 export const MBSet = {
+    exp:10,
     ap_exp:100,
     def_exp:100,
     hp_exp:100,
     ap_add:10,
-    def_add:10,
+    def_add:5,
     hp_add:50,
     crit_add:1,
     dodge_add:1,

assets/script/game/common/config/RewardSet.ts

@@ -5,14 +5,14 @@ export const BoxDrop={
           {uuid: 9003,dropRate: 10,num_max: 500,type:0},
      ], 
      2:[
-          {uuid: 1001,dropRate: 10,num_max: 10,type:0},
-          {uuid: 1002,dropRate: 10,num_max: 10,type:0},
-           
-     ],
-      3:[
           {uuid: 9001,dropRate: 10,num_max: 10,type:0},
           {uuid: 9002,dropRate: 10,num_max: 10,type:0},
-          {uuid: 9003,dropRate: 10,num_max: 10,type:0},
+          {uuid: 9003,dropRate: 50,num_max: 10,type:0},
+     ],
+     3:[
+          {uuid: 9001,dropRate: 20,num_max: 10,type:0},
+          {uuid: 9002,dropRate: 20,num_max: 10,type:0},
+          {uuid: 9003,dropRate: 50,num_max: 10,type:0},
      ],
 }
 export const BoxDropCount={

assets/script/game/common/config/heroSet.ts

@@ -45,42 +45,42 @@ import { Talents } from "./TalentSet"
 **/
 export const HeroInfo = {
    9001: {
-      uuid:9001,name: "圣盾骑士",path:"k1",type:1,hp: 200, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9001,name: "圣盾骑士",path:"k1",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
       lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:10,uapw:10,cpw:10,dpw:10,dopw:10,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    9002: {
-      uuid:9002,name: "狂暴骑士",path:"k2",type:1,hp: 200, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9002,name: "狂暴骑士",path:"k2",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
       lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    9003: {
-      uuid:9003,name: "防御骑士",path:"k3",type:1,hp: 200, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9003,name: "防御骑士",path:"k3",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
       lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    9004: {
-      uuid:9003,name: "111",path:"a1",type:1,hp: 200, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9003,name: "111",path:"a1",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
       lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    9005: {
-      uuid:9003,name: "222",path:"a2",type:1,hp: 200, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9003,name: "222",path:"a2",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
       lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    9006: {
-      uuid:9003,name: "333",path:"a3",type:1,hp: 200, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9003,name: "333",path:"a3",type:1,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
       lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,

assets/script/game/map/HCardComp.ts

@@ -49,7 +49,7 @@ export class HCardComp extends CCComp {
             this.is_dead=false
         }
         this.hp.string=this.heros[this.hi].HeroView.hp_max
-        this.ap.string=this.heros[this.hi].HeroView.ap
+        this.ap.string=this.heros[this.hi].HeroView.ap+smc.vmdata.mission.ap
         this.life.progress=this.heros[this.hi].HeroView.hp/this.heros[this.hi].HeroView.hp_max
         this.pw.progress=this.heros[this.hi].HeroView.pw/this.heros[this.hi].HeroView.pwm
         

assets/script/game/map/LuckHomeComp.ts

@@ -133,8 +133,10 @@ export class LuckHomeCompComp extends CCComp {
                 smc.heros[uuid].num += num
                 break;
             case 2:
-                this.show_skill_chip(uuid,num)
+                this.show_hero_chip(uuid,num)
-                smc.skills[uuid].num += num
+                smc.heros[uuid].num += num
+                // this.show_skill_chip(uuid,num)
+                // smc.skills[uuid].num += num
                 break;
             case 1:
                 this.show_item(uuid,num)

assets/script/game/map/MissionComp.ts

@@ -47,16 +47,15 @@ export class MissionComp extends CCComp {
     MMSComp:MSkillComp=null
     
     onLoad(){
-        this.MSComp=this.node.getChildByName("msk").getComponent(MSkillComp)
+        // this.MSComp=this.node.getChildByName("msk").getComponent(MSkillComp)
-        this.MMSComp=this.node.getChildByName("mmsk").getComponent(MSkillComp)
+        // this.MMSComp=this.node.getChildByName("mmsk").getComponent(MSkillComp)
-        this.MSComp.group=BoxSet.HERO
+        // this.MSComp.group=BoxSet.HERO
-        this.MSComp.s_uuid=smc.mission.mskill
+        // this.MSComp.s_uuid=smc.mission.mskill
-        this.MMSComp.group=BoxSet.MONSTER
+        // this.MMSComp.group=BoxSet.MONSTER
-        this.MMSComp.s_uuid=smc.mission.mmskill
+        // this.MMSComp.s_uuid=smc.mission.mmskill
     }
     start() {
         // this.VictoryComp=this.node.getChildByName("victory").getComponent(VictoryComp)
-        console.log("mission_start:",this.MSComp)
     }
     
     protected update(dt: number): void {
@@ -78,10 +77,9 @@ export class MissionComp extends CCComp {
         /* todo   关卡设定完善*/
         let mon_set=RandomManager.instance.getRandomByObjectList(MissionSet,1)
         this.mon_list=mon_set[0]
-        console.log("mission_start:",this.mon_list,this.MSComp,this.MMSComp)
+        console.log("mission_start:",this.mon_list)
-
         this.mission_init()
-        this.mskill_init()
+        // this.mskill_init()
         this.mon_refresh()
         this.heros_call()
     }
@@ -130,8 +128,7 @@ export class MissionComp extends CCComp {
         smc.mission.is_defeat=false
         smc.vmdata.mission.exp=0 //局内经验
         smc.vmdata.mission.mexp=0 //敌方局内经验
-        smc.vmdata.mission.exp_max=99999 //局内经验
+        smc.vmdata.mission.exp_max= smc.vmdata.mission.mexp_max=MBSet.exp
-        smc.vmdata.mission.mexp_max=99999 //敌方局内经验
         smc.vmdata.mission.ap=0
         smc.vmdata.mission.hp=0
         smc.vmdata.mission.def=0
@@ -144,6 +141,16 @@ export class MissionComp extends CCComp {
         smc.vmdata.mission.mcrit=0
         smc.vmdata.mission.mdead=0
         smc.vmdata.mission.mdodge=0
+        // smc.vmdata.mission.ap_up=0
+        // smc.vmdata.mission.hp_up=0
+        // smc.vmdata.mission.def_up=0
+        // smc.vmdata.mission.crit_up=0
+        // smc.vmdata.mission.dodge_up=0
+        // smc.vmdata.mission.map_up=0
+        // smc.vmdata.mission.mhp_up=0
+        // smc.vmdata.mission.mdef_up=0
+        // smc.vmdata.mission.mcrit_up=0
+        // smc.vmdata.mission.mdodge_up=0
         // this.clear_x1()
     }
     clear_x1(){
@@ -165,9 +172,37 @@ export class MissionComp extends CCComp {
         this.MMSComp.init()
     }
     check_buff(){
+        if(smc.vmdata.mission.exp >= smc.vmdata.mission.exp_max){
+            smc.vmdata.mission.exp-=smc.vmdata.mission.exp_max
+            this.do_buff()
+        }
+        // if(smc.mission.mexp >= smc.vmdata.mission.mexp_max){
+        //     smc.vmdata.mission.mexp-=smc.vmdata.mission.mexp_max
+        //     this.do_mbuff()
+        // }
+    }
+    do_buff(){
+        smc.vmdata.mission.ap+=smc.vmdata.mission.ap_up
+        smc.vmdata.mission.hp+=smc.vmdata.mission.hp_up
+        smc.vmdata.mission.def+=smc.vmdata.mission.def_up
+        smc.vmdata.mission.crit+=smc.vmdata.mission.crit_up
+        smc.vmdata.mission.dodge+=smc.vmdata.mission.dodge_up
+        if(smc.vmdata.mission.hp_up > 0 ){
+            let heros:any =ecs.query(ecs.allOf(HeroModelComp));
+            for (let i = 0; i < heros.length; i++) {
+                heros[i].HeroView.add_hp_max(smc.vmdata.mission.hp_up)
+            }
+        }
         
     }
-    
+    // do_mbuff(){
+    //     smc.vmdata.mission.map+=smc.vmdata.mission.map_up
+    //     smc.vmdata.mission.mhp+=smc.vmdata.mission.mhp_up
+    //     //todo hp 需要特殊处理
+    //     smc.vmdata.mission.mdef+=smc.vmdata.mission.mdef_up
+    //     smc.vmdata.mission.mcrit+=smc.vmdata.mission.mcrit_up
+    //     smc.vmdata.mission.mdodge+=smc.vmdata.mission.mdodge_up
+    // }
     check_mon_num(){
         let mons:any = this.get_mons()
         let heros:any= this.get_heros()

assets/script/game/map/MissionHomeComp.ts

@@ -24,11 +24,11 @@ export class MissionHomeComp extends CCComp {
 
     heros:any[]=[];
     heros_pos:any=[ 
-        {uuid:0,px:-300},
-        {uuid:0,px:-200},
-        {uuid:0,px:-100},
-        {uuid:0,px:0},
         {uuid:0,px:100},
+        {uuid:0,px:0},
+        {uuid:0,px:-100},
+        {uuid:0,px:-200},
+        {uuid:0,px:-300},
     ]
 
     /** 视图层逻辑代码分离演示 */