diff --git a/DataTables/Datas/战斗/角色/角色技能.xlsx b/DataTables/Datas/战斗/角色/角色技能.xlsx index 4a887ecb..99910c39 100644 Binary files a/DataTables/Datas/战斗/角色/角色技能.xlsx and b/DataTables/Datas/战斗/角色/角色技能.xlsx differ diff --git a/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab index 1b58f4e1..17867d4a 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab @@ -332,7 +332,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 216.90625, + "width": 161.33984375, "height": 71 }, "_anchorPoint": { @@ -368,7 +368,7 @@ "b": 255, "a": 255 }, - "_string": "匹 配 中 . . .", + "_string": "匹 配 中 ", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 40, diff --git a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts index 17244c34..275a3ba2 100644 --- a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts +++ b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts @@ -43,6 +43,9 @@ export default class GBattleModeManager extends Singleton { //自动推帧间隔 autoTime:number = 0; + //默认模式 + default:BattleMode = BattleMode.OnHook; //默认无限模式 + //初始化管理器 async onInit(info:GBattleModeInfo){ @@ -59,7 +62,14 @@ export default class GBattleModeManager extends Singleton { } //打开指定模式 - async Open(mode:BattleMode,isAuto:boolean = false){ + async Open(mode:BattleMode = null,isAuto:boolean = false){ + + if(!this.current && mode == null){ + await this.Open(this.default,true); + return; + }else if(mode == null){ + return; + } this.current = mode; this.setAuto(isAuto); @@ -76,6 +86,8 @@ export default class GBattleModeManager extends Singleton { app.sync.onReset(); this.current = null; + await this.Open(); + } //设置自动推帧 ( 帧不由addFrame控制 管理器自动推帧) diff --git a/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts b/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts index b7c963a8..d1d096fb 100644 --- a/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts +++ b/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts @@ -44,7 +44,7 @@ export default class GSkillCrazySquirrel extends GSkillCDBase{ end:() => { //从天而降 let pos = enemy.v2World.add(v2(0,1000)); - let end = enemy.v2World; + let end = enemy.v2World.clone(); //生成火球 let spine = GSpine.onCreateSpine(app.battleRes.roleResSpine[30004]); diff --git a/JisolGameCocos/assets/script/ui/Home/MainView.ts b/JisolGameCocos/assets/script/ui/Home/MainView.ts index 4037bca1..ae282dd7 100644 --- a/JisolGameCocos/assets/script/ui/Home/MainView.ts +++ b/JisolGameCocos/assets/script/ui/Home/MainView.ts @@ -16,8 +16,8 @@ export class MainView extends JNGLayerBase { onJNLoad(data?: any): void { - //默认无限模式 - GBattleModeManager.getIns().Open(BattleMode.OnHook,true); + //打开默认模式 + GBattleModeManager.getIns().Open(); //发送消息 ChatData.getIns().onSend({