diff --git a/assets/resources/game/skills/buff_to.prefab b/assets/resources/game/skills/buff_to.prefab index f3533024..aa8a942d 100644 --- a/assets/resources/game/skills/buff_to.prefab +++ b/assets/resources/game/skills/buff_to.prefab @@ -85,7 +85,7 @@ "__id__": 3 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 9 diff --git a/assets/resources/game/skills/heath_small.prefab b/assets/resources/game/skills/heath_small.prefab index a65ee2e8..93b4e647 100644 --- a/assets/resources/game/skills/heath_small.prefab +++ b/assets/resources/game/skills/heath_small.prefab @@ -85,7 +85,7 @@ "__id__": 3 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 9 diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 0806ed90..9965b014 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -120286,7 +120286,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 1110, + "y": 982.409, "z": 0 }, "_lrot": { @@ -120377,7 +120377,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 75.615234375, - "height": 146 + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -120416,9 +120416,9 @@ "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 100, - "_fontSize": 100, + "_fontSize": 200, "_fontFamily": "Arial", - "_lineHeight": 100, + "_lineHeight": 200, "_overflow": 0, "_enableWrapText": true, "_font": null, @@ -120515,7 +120515,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 120, + "_top": 300, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index dd67debf..2a7cc39b 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -241,11 +241,11 @@ export const SkillSet = { debuff:0,deV:0,deC:0,deR:100,in:8,ap:100,cd:5,hit:1,hited:3,buV:0,buC:0,buR:100,speed:720,cost:10,info:"向最前方敌人释放箭矢,造成100%攻击的伤害"}, 6004:{uuid:6004,name:"护盾",for_hero:true,sp_name:"buff_to",path:"3045",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, - TGroup:TGroup.Team,SType:SType.shield,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.StartEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:0, + TGroup:TGroup.Team,SType:SType.shield,act:"max",DTType:DTType.single,CdType:CdType.cd,AType:AType.StartEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:0, debuff:0,deV:0,deC:0,deR:100,in:1,ap:0,cd:10,hit:1,hited:3,buV:2,buC:0,buR:100,speed:720,cost:10,info:"为最前排队友召唤一个可以抵御2次攻击的圣盾(最高叠加到6次)"}, 6005:{uuid:6005,name:"治疗", for_hero:true, sp_name:"heath_small",path:"3056",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, - TGroup:TGroup.Team,SType:SType.heal,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.StartEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:0, + TGroup:TGroup.Team,SType:SType.heal,act:"max",DTType:DTType.single,CdType:CdType.cd,AType:AType.StartEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:0, debuff:0,deV:0,deC:0,deR:100,in:1,ap:0,cd:5,hit:0,hited:0,buV:20,buC:0,buR:100,speed:0,cost:10,info:"回复最前排队友10%最大生命值的生命"}, 6006:{uuid:6006,name:"铁斧打击",for_hero:false,sp_name:"base_ft",path:"3036",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index 191f48b7..43936763 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -64,15 +64,15 @@ export class MissionComp extends CCComp { } } - if(this.is_in_wave){ - if(this.wave_time_cd.update(dt)){ - smc.vmdata.mission_data.wave_time_num-- - if(smc.vmdata.mission_data.wave_time_num<=0){ - this.hide_wave_time() - this.show_time(this.do_next_wave.bind(this)) - } - } - } + // if(this.is_in_wave){ + // if(this.wave_time_cd.update(dt)){ + // smc.vmdata.mission_data.wave_time_num-- + // if(smc.vmdata.mission_data.wave_time_num<=0){ + // this.hide_wave_time() + // this.show_time(this.do_next_wave.bind(this)) + // } + // } + // } } //奖励发放 do_reward(){ @@ -84,6 +84,14 @@ export class MissionComp extends CCComp { do_mon_dead(){ smc.vmdata.mission_data.mon_num-- if(smc.vmdata.mission_data.mon_num<=0) { + switch(smc.vmdata.mission_data.current_wave){ + case 1: + this.do_next_wave() + break + case 2: + this.do_next_wave() + break + } this.show_time(this.do_next_wave.bind(this)) } } diff --git a/assets/script/game/map/RogueConfig.ts b/assets/script/game/map/RogueConfig.ts index d19caf38..8b155294 100644 --- a/assets/script/game/map/RogueConfig.ts +++ b/assets/script/game/map/RogueConfig.ts @@ -33,6 +33,9 @@ export enum RogueWaveType { FINAL_BOSS = "final_boss" // 最终Boss波次(9波) } +//奖励天赋波次数 +export const RewardTalWave = [1,2,3,4,5,6,7,8,9] + /** * 固定数值配置(根据波次固定血量和攻击力) */