From 324736a61954a0e546d9f005d30d4676cbb0674a Mon Sep 17 00:00:00 2001 From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com> Date: Sat, 28 Oct 2023 02:51:05 +0800 Subject: [PATCH] update --- .../resources/config/game/GRoleAttack.json | 2 +- .../base/attack/GAttackParabolicRemote.ts | 32 +++++++++++++++--- .../battle/base/bullet/GButtleDefault.ts | 1 - .../script/battle/base/role/GRoleBase.ts | 8 ++--- .../battle/base/role/PVP/GRolePVPEntity.ts | 2 +- JisolGameCocos/config/GRoleAttack.xlsx | Bin 11186 -> 11185 bytes JisolGameCocos/extensions/ngame | 2 +- 7 files changed, 34 insertions(+), 13 deletions(-) diff --git a/JisolGameCocos/assets/resources/config/game/GRoleAttack.json b/JisolGameCocos/assets/resources/config/game/GRoleAttack.json index ea121e27..57af18e7 100644 --- a/JisolGameCocos/assets/resources/config/game/GRoleAttack.json +++ b/JisolGameCocos/assets/resources/config/game/GRoleAttack.json @@ -1 +1 @@ -{"10001":{"roleId":10001,"attackWay":"Normal","attackArgs":[]},"10002":{"roleId":10002,"attackWay":"Normal","attackArgs":[]},"10003":{"roleId":10003,"attackWay":"ParabolicRemote","attackArgs":["20001",0.4]}} \ No newline at end of file +{"10001":{"roleId":10001,"attackWay":"Normal","attackArgs":[]},"10002":{"roleId":10002,"attackWay":"Normal","attackArgs":[]},"10003":{"roleId":10003,"attackWay":"ParabolicRemote","attackArgs":["20001",0.6,"timo5 007"]}} \ No newline at end of file diff --git a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicRemote.ts b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicRemote.ts index 79d019ad..d7c3c5c3 100644 --- a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicRemote.ts +++ b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicRemote.ts @@ -4,13 +4,13 @@ import { app } from "../../../App"; import GRoleBase from "../role/GRoleBase"; import { GAttackBase, GAttackBullet } from "./GAttack"; import GButtleDefault from "../bullet/GButtleDefault"; -import { size } from "cc"; -import { Size } from "cc"; -import { Vec2 } from "cc"; -import { v2 } from "cc"; import { v3 } from "cc"; +import { bezier } from "cc"; +import { v2 } from "cc"; +import { Vec2 } from "cc"; /** * 抛物线普攻 + * 攻击子弹,子弹大小,龙骨-初始位置 */ export default class GAttackParabolicRemote implements GAttackBase{ @@ -18,7 +18,7 @@ export default class GAttackParabolicRemote implements GAttackBase{ //[子弹图片] let image:SpriteFrame = app.role.bullets[info.attackArgs[0]]; let scale:number = info.attackArgs[1] as unknown as number; - let bone = role.spine.findBone("timo5 007"); + let bone = role.spine.findBone(info.attackArgs[2]); console.log(role.spine,bone); let bullet = GAttackBullet.create(GButtleDefault,{ image:image, @@ -26,7 +26,29 @@ export default class GAttackParabolicRemote implements GAttackBase{ }); role.mode.addGObject(bullet); let world2 = role.node.worldPosition.clone().add(v3(bone.worldX,bone.worldY,0)) + + //设置子弹位置 bullet.node.setWorldPosition(v3(world2.x,world2.y,world2.z)) + + //子弹移动 + let start = bullet.v2World; + let end = role.fsm.enemy.v2World; + let center = v2(((start.x + end.x) / 2),((start.y + end.y) / 2) + (Math.abs((start.x - end.x)) / 2)); + // start.rotate(90).normalize().multiplyScalar(50); + + bullet.JTween({}) + .to({},Vec2.distance(start,end)*3) + .onUpdate((data,elapsed) => { + // console.log(data,elapsed,bezier(0,6,12,1,elapsed),bezier(0,6,12,1,elapsed)) + bullet.node.setWorldPosition(v3( + bezier(start.x,center.x,center.x,end.x,elapsed), + bezier(start.y,center.y,center.y,end.y,elapsed), + 0 + )) + }) + .start(); + + } } diff --git a/JisolGameCocos/assets/script/battle/base/bullet/GButtleDefault.ts b/JisolGameCocos/assets/script/battle/base/bullet/GButtleDefault.ts index ed63460e..60202f60 100644 --- a/JisolGameCocos/assets/script/battle/base/bullet/GButtleDefault.ts +++ b/JisolGameCocos/assets/script/battle/base/bullet/GButtleDefault.ts @@ -12,7 +12,6 @@ const { ccclass, property } = _decorator; export interface GButtleDefaultInfo{ image:SpriteFrame;//子弹图片 scale:number; //子弹大小 - start:Vec2; //子弹初始位置 } //默认子弹类 diff --git a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts index ef869993..e64c4e6e 100644 --- a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts +++ b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts @@ -170,12 +170,12 @@ export default abstract class GRoleBase extends GObject{ console.log("onFly"); let vWorld = this.node.worldPosition; let vEndWorld = this.getWorldBackLen(v2(800,500)); - JTween(vWorld) - .to({x:vEndWorld.x},500) + this.JTween(vWorld) + .to({x:vEndWorld.x},600) .onUpdate(pos => this.node.worldPosition = vWorld) .start(); - JTween(vWorld) - .to({y:vEndWorld.y},500) + this.JTween(vWorld) + .to({y:vEndWorld.y},600) .easing(JEasing.Circular.Out) .onUpdate(pos => this.node.worldPosition = vWorld) .start(); diff --git a/JisolGameCocos/assets/script/battle/base/role/PVP/GRolePVPEntity.ts b/JisolGameCocos/assets/script/battle/base/role/PVP/GRolePVPEntity.ts index d02158ce..565354c4 100644 --- a/JisolGameCocos/assets/script/battle/base/role/PVP/GRolePVPEntity.ts +++ b/JisolGameCocos/assets/script/battle/base/role/PVP/GRolePVPEntity.ts @@ -71,7 +71,7 @@ export default class GRolePVPEntity extends GRoleBase{ if(this.isDie){ //销毁数据 this.mode.killRole(this); - this.node.removeFromParent(); + // this.node.removeFromParent(); } } diff --git a/JisolGameCocos/config/GRoleAttack.xlsx b/JisolGameCocos/config/GRoleAttack.xlsx index 7e361a0d2b2cb59b4cc64769429406252eae0eb1..620e3f6c9513c56aae9962db72bae75788e410fc 100644 GIT binary patch delta 2908 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 JV@4eD{{tq^OlAN8 delta 2890 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 IMSpSs3!O9)b^rhX diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index 79372047..68c2a35b 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit 793720478680b54892b7f43b880c435f3f1c6990 +Subproject commit 68c2a35bfd51ef351accf992f9637c9ce152ebe6