Test_Project_Cocos/DelayNoMore
1
0
Fork 0
mirror of https://github.com/genxium/DelayNoMore synced 2025-10-09 00:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed frontend debug drawer.

Browse Source
This commit is contained in:
genxium
2023-01-04 23:48:00 +08:00
parent 80c6e05731
commit 2d04363d69
18 changed files with 1127 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
frontend/assets/scripts/Map.js
View File

@@ -329,6 +329,56 @@ cc.Class({
}
},
initDebugDrawers() {
const self = this;
if (self.showCriticalCoordinateLabels) {
const drawer1 = new cc.Node();
drawer1.setPosition(cc.v2(0, 0))
safelyAddChild(self.node, drawer1);
setLocalZOrder(drawer1, 999);
const g1 = drawer1.addComponent(cc.Graphics);
g1.lineWidth = 2;
self.g1 = g1;
const collisionSpaceObjs = gopkgs.GetCollisionSpaceObjsJs(self.gopkgsCollisionSys); // This step is slow according to Chrome profiling, and we only need draw it once for those static barriers
for (let k in collisionSpaceObjs) {
const body = collisionSpaceObjs[k];
let padding = 0;
if (null != body.Data && null != body.Data.JoinIndex) {
// character
if (1 == body.Data.JoinIndex) {
g1.strokeColor = cc.Color.BLUE;
} else {
g1.strokeColor = cc.Color.RED;
}
padding = self.snapIntoPlatformOverlap;
} else {
// barrier
g1.strokeColor = cc.Color.WHITE;
}
const points = body.Shape.Points;
const wpos = [body.X - self.spaceOffsetX, body.Y - self.spaceOffsetY];
g1.moveTo(wpos[0], wpos[1]);
const cnt = points.length;
for (let j = 0; j < cnt; j += 1) {
const x = wpos[0] + points[j][0],
y = wpos[1] + points[j][1];
g1.lineTo(x, y);
}
g1.lineTo(wpos[0], wpos[1]);
g1.stroke();
}
const drawer2 = new cc.Node();
drawer2.setPosition(cc.v2(0, 0))
safelyAddChild(self.node, drawer2);
setLocalZOrder(drawer2, 999);
const g2 = drawer2.addComponent(cc.Graphics);
g2.lineWidth = 2;
self.g2 = g2;
}
},
onLoad() {
const self = this;
window.mapIns = self;
@@ -418,16 +468,6 @@ cc.Class({
mapNode.removeAllChildren();
self._resetCurrentMatch();
if (self.showCriticalCoordinateLabels) {
const drawer = new cc.Node();
drawer.setPosition(cc.v2(0, 0))
safelyAddChild(self.node, drawer);
setLocalZOrder(drawer, 999);
const g = drawer.addComponent(cc.Graphics);
g.lineWidth = 2;
self.g = g;
}
tiledMapIns.tmxAsset = tmxAsset;
const newMapSize = tiledMapIns.getMapSize();
const newTileSize = tiledMapIns.getTileSize();
@@ -456,37 +496,6 @@ cc.Class({
const newBarrierCollider = gopkgs.GenerateConvexPolygonColliderJs(gopkgsBoundary, self.spaceOffsetX, self.spaceOffsetY, gopkgsBarrier, "Barrier");
self.gopkgsCollisionSys.Add(newBarrierCollider);
if (false && self.showCriticalCoordinateLabels) {
for (let i = 0; i < boundaryObj.length; ++i) {
const barrierVertLabelNode = new cc.Node();
switch (i % 4) {
case 0:
barrierVertLabelNode.color = cc.Color.RED;
break;
case 1:
barrierVertLabelNode.color = cc.Color.GRAY;
break;
case 2:
barrierVertLabelNode.color = cc.Color.BLACK;
break;
default:
barrierVertLabelNode.color = cc.Color.MAGENTA;
break;
}
const wx = boundaryObj.anchor.x + boundaryObj[i].x,
wy = boundaryObj.anchor.y + boundaryObj[i].y;
barrierVertLabelNode.setPosition(cc.v2(wx, wy));
const barrierVertLabel = barrierVertLabelNode.addComponent(cc.Label);
barrierVertLabel.fontSize = 12;
barrierVertLabel.lineHeight = barrierVertLabel.fontSize + 1;
barrierVertLabel.string = `(${wx.toFixed(1)}, ${wy.toFixed(1)})`;
safelyAddChild(self.node, barrierVertLabelNode);
setLocalZOrder(barrierVertLabelNode, 5);
barrierVertLabelNode.active = true;
}
}
// console.log("Created barrier: ", newBarrierCollider);
++barrierIdCounter;
const collisionBarrierIndex = (self.collisionBarrierIndexPrefix + barrierIdCounter);
@@ -496,7 +505,7 @@ cc.Class({
Object.assign(self.selfPlayerInfo, {
Id: self.selfPlayerInfo.playerId
});
self.initDebugDrawers();
const reqData = window.pb.protos.WsReq.encode({
msgId: Date.now(),
act: window.UPSYNC_MSG_ACT_PLAYER_COLLIDER_ACK,
@@ -569,13 +578,13 @@ cc.Class({
const jsPlayersArr = new Array().fill(null);
for (let k in pbRdf.playersArr) {
const pbPlayer = pbRdf.playersArr[k];
const jsPlayer = gopkgs.NewPlayerDownsyncJs(pbPlayer.id, pbPlayer.virtualGridX, pbPlayer.virtualGridY, pbPlayer.dirX, pbPlayer.dirY, pbPlayer.velX, pbPlayer.velY, pbPlayer.framesToRecover, pbPlayer.framesInChState, pbPlayer.activeSkillId, pbPlayer.activeSkillHit, pbPlayer.speed, pbPlayer.battleState, pbPlayer.characterState, pbPlayer.joinIndex, pbPlayer.hp, pbPlayer.maxHp, pbPlayer.colliderRadius, pbPlayer.inAir);
const jsPlayer = gopkgs.NewPlayerDownsyncJs(pbPlayer.id, pbPlayer.virtualGridX, pbPlayer.virtualGridY, pbPlayer.dirX, pbPlayer.dirY, pbPlayer.velX, pbPlayer.velY, pbPlayer.framesToRecover, pbPlayer.framesInChState, pbPlayer.activeSkillId, pbPlayer.activeSkillHit, pbPlayer.framesInvinsible, pbPlayer.framesSelfLockVel, pbPlayer.speed, pbPlayer.battleState, pbPlayer.characterState, pbPlayer.joinIndex, pbPlayer.hp, pbPlayer.maxHp, pbPlayer.colliderRadius, pbPlayer.inAir);
jsPlayersArr[k] = jsPlayer;
}
const jsMeleeBulletsArr = [];
for (let k in pbRdf.meleeBullets) {
const pbBullet = pbRdf.meleeBullets[k];
const jsBullet = gopkgs.NewMeleeBulletJs(pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp);
const jsBullet = gopkgs.NewMeleeBulletJs(pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.framesSelfLockVel, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp);
jsMeleeBulletsArr.push(jsBullet);
}
@@ -849,7 +858,7 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
let st = performance.now();
let prevSelfInput = null,
currSelfInput = null;
const noDelayInputFrameId = gopkgs.ConvertToNoDelayInputFrameId(self.renderFrameId);
const noDelayInputFrameId = gopkgs.ConvertToNoDelayInputFrameId(self.renderFrameId);
if (gopkgs.ShouldGenerateInputFrameUpsync(self.renderFrameId)) {
[prevSelfInput, currSelfInput] = self.getOrPrefabInputFrameUpsync(noDelayInputFrameId);
}
@@ -1207,71 +1216,42 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
rightPadding = 0.1,
topPadding = 0.1,
bottomPadding = 0.1;
if (self.showCriticalCoordinateLabels) {
let g = self.g;
g.clear();
const collisionSpaceObjs = gopkgs.GetCollisionSpaceObjsJs(self.gopkgsCollisionSys);
for (let k in collisionSpaceObjs) {
const body = collisionSpaceObjs[k];
let padding = 0;
if (null != body.Data && null != body.Data.JoinIndex) {
// character
if (1 == body.Data.JoinIndex) {
g.strokeColor = cc.Color.BLUE;
} else {
g.strokeColor = cc.Color.RED;
}
padding = self.snapIntoPlatformOverlap;
} else {
// barrier
g.strokeColor = cc.Color.WHITE;
}
const points = body.Shape.Points;
const wpos = [body.X - self.spaceOffsetX, body.Y - self.spaceOffsetY];
g.moveTo(wpos[0], wpos[1]);
const cnt = points.length;
for (let j = 0; j < cnt; j += 1) {
const x = wpos[0] + points[j][0],
y = wpos[1] + points[j][1];
g.lineTo(x, y);
}
g.lineTo(wpos[0], wpos[1]);
g.stroke();
}
if (self.showCriticalCoordinateLabels && self.g2) {
let g2 = self.g2;
g2.clear();
for (let k in rdf.PlayersArr) {
const player = rdf.PlayersArr[k];
if (1 == player.JoinIndex) {
g.strokeColor = cc.Color.BLUE;
g2.strokeColor = cc.Color.BLUE;
} else {
g.strokeColor = cc.Color.RED;
g2.strokeColor = cc.Color.RED;
}
let [colliderWidth, colliderHeight] = [player.ColliderRadius*2, player.ColliderRadius*4];
switch (player.CharacterState) {
case ATK_CHARACTER_STATE.LayDown1[0]:
[colliderWidth, colliderHeight] = [player.ColliderRadius*4, player.ColliderRadius*2];
let [colliderWidth, colliderHeight] = [player.ColliderRadius * 2, player.ColliderRadius * 4];
switch (player.CharacterState) {
case ATK_CHARACTER_STATE.LayDown1[0]:
[colliderWidth, colliderHeight] = [player.ColliderRadius * 4, player.ColliderRadius * 2];
break;
case ATK_CHARACTER_STATE.BlownUp1[0]:
case ATK_CHARACTER_STATE.InAirIdle1NoJump[0]:
case ATK_CHARACTER_STATE.InAirIdle1ByJump[0]:
[colliderWidth, colliderHeight] = [player.ColliderRadius*2, player.ColliderRadius*2];
case ATK_CHARACTER_STATE.BlownUp1[0]:
case ATK_CHARACTER_STATE.InAirIdle1NoJump[0]:
case ATK_CHARACTER_STATE.InAirIdle1ByJump[0]:
[colliderWidth, colliderHeight] = [player.ColliderRadius * 2, player.ColliderRadius * 2];
break;
}
}
const [halfColliderWidth, halfColliderHeight] = gopkgs.VirtualGridToWorldPos((colliderWidth >> 1), (colliderHeight >> 1));
const [halfColliderWidth, halfColliderHeight] = gopkgs.VirtualGridToWorldPos((colliderWidth >> 1), (colliderHeight >> 1));
const [wx, wy] = gopkgs.VirtualGridToWorldPos(player.VirtualGridX, player.VirtualGridY);
const [cx, cy] = gopkgs.WorldToPolygonColliderBLPos(wx, wy, halfColliderWidth, halfColliderHeight, topPadding, bottomPadding, leftPadding, rightPadding, 0, 0);
const pts = [[0, 0], [leftPadding + halfColliderWidth*2 + rightPadding, 0], [leftPadding + halfColliderWidth*2 + rightPadding, bottomPadding + halfColliderHeight*2 + topPadding], [0, bottomPadding + halfColliderHeight*2 + topPadding]];
const pts = [[0, 0], [leftPadding + halfColliderWidth * 2 + rightPadding, 0], [leftPadding + halfColliderWidth * 2 + rightPadding, bottomPadding + halfColliderHeight * 2 + topPadding], [0, bottomPadding + halfColliderHeight * 2 + topPadding]];
g.moveTo(cx, cy);
g2.moveTo(cx, cy);
for (let j = 0; j < pts.length; j += 1) {
g.lineTo(pts[j][0] + cx, pts[j][1] + cy);
g2.lineTo(pts[j][0] + cx, pts[j][1] + cy);
}
g.lineTo(cx, cy);
g.stroke();
g2.lineTo(cx, cy);
g2.stroke();
}
for (let k in rdf.MeleeBullets) {
@@ -1281,11 +1261,11 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
&&
meleeBullet.Bullet.OriginatedRenderFrameId + meleeBullet.Bullet.StartupFrames + meleeBullet.Bullet.ActiveFrames > rdf.Id
) {
const offender = rdf.PlayersArr[meleeBullet.Bullet.OffenderJoinIndex-1];
const offender = rdf.PlayersArr[meleeBullet.Bullet.OffenderJoinIndex - 1];
if (1 == offender.JoinIndex) {
g.strokeColor = cc.Color.BLUE;
g2.strokeColor = cc.Color.BLUE;
} else {
g.strokeColor = cc.Color.RED;
g2.strokeColor = cc.Color.RED;
}
let xfac = 1; // By now, straight Punch offset doesn't respect "y-axis"
@@ -1295,14 +1275,14 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
const [bulletWx, bulletWy] = gopkgs.VirtualGridToWorldPos(offender.VirtualGridX + xfac * meleeBullet.Bullet.HitboxOffsetX, offender.VirtualGridY);
const [halfColliderWidth, halfColliderHeight] = gopkgs.VirtualGridToWorldPos((meleeBullet.Bullet.HitboxSizeX >> 1), (meleeBullet.Bullet.HitboxSizeY >> 1));
const [bulletCx, bulletCy] = gopkgs.WorldToPolygonColliderBLPos(bulletWx, bulletWy, halfColliderWidth, halfColliderHeight, topPadding, bottomPadding, leftPadding, rightPadding, 0, 0);
const pts = [[0, 0], [leftPadding + halfColliderWidth*2 + rightPadding, 0], [leftPadding + halfColliderWidth*2 + rightPadding, bottomPadding + halfColliderHeight*2 + topPadding], [0, bottomPadding + halfColliderHeight*2 + topPadding]];
const pts = [[0, 0], [leftPadding + halfColliderWidth * 2 + rightPadding, 0], [leftPadding + halfColliderWidth * 2 + rightPadding, bottomPadding + halfColliderHeight * 2 + topPadding], [0, bottomPadding + halfColliderHeight * 2 + topPadding]];
g.moveTo(bulletCx, bulletCy);
g2.moveTo(bulletCx, bulletCy);
for (let j = 0; j < pts.length; j += 1) {
g.lineTo(pts[j][0] + bulletCx, pts[j][1] + bulletCy);
g2.lineTo(pts[j][0] + bulletCx, pts[j][1] + bulletCy);
}
g.lineTo(bulletCx, bulletCy);
g.stroke();
g2.lineTo(bulletCx, bulletCy);
g2.stroke();
}
}
}

36
frontend/assets/scripts/OfflineMap.js
View File

@@ -13,7 +13,7 @@ cc.Class({
onLoad() {
const self = this;
window.mapIns = self;
self.showCriticalCoordinateLabels = false;
self.showCriticalCoordinateLabels = true;
const mapNode = self.node;
const canvasNode = mapNode.parent;
@@ -83,42 +83,12 @@ cc.Class({
const newBarrierCollider = gopkgs.GenerateConvexPolygonColliderJs(gopkgsBoundary, self.spaceOffsetX, self.spaceOffsetY, gopkgsBarrier, "Barrier");
self.gopkgsCollisionSys.Add(newBarrierCollider);
if (false && self.showCriticalCoordinateLabels) {
for (let i = 0; i < boundaryObj.length; ++i) {
const barrierVertLabelNode = new cc.Node();
switch (i % 4) {
case 0:
barrierVertLabelNode.color = cc.Color.RED;
break;
case 1:
barrierVertLabelNode.color = cc.Color.GRAY;
break;
case 2:
barrierVertLabelNode.color = cc.Color.BLACK;
break;
default:
barrierVertLabelNode.color = cc.Color.MAGENTA;
break;
}
const wx = boundaryObj.anchor.x + boundaryObj[i].x,
wy = boundaryObj.anchor.y + boundaryObj[i].y;
barrierVertLabelNode.setPosition(cc.v2(wx, wy));
const barrierVertLabel = barrierVertLabelNode.addComponent(cc.Label);
barrierVertLabel.fontSize = 12;
barrierVertLabel.lineHeight = barrierVertLabel.fontSize + 1;
barrierVertLabel.string = `(${wx.toFixed(1)}, ${wy.toFixed(1)})`;
safelyAddChild(self.node, barrierVertLabelNode);
setLocalZOrder(barrierVertLabelNode, 5);
barrierVertLabelNode.active = true;
}
}
// console.log("Created barrier: ", newBarrierCollider);
++barrierIdCounter;
const collisionBarrierIndex = (self.collisionBarrierIndexPrefix + barrierIdCounter);
self.gopkgsCollisionSysMap[collisionBarrierIndex] = newBarrierCollider;
}
self.initDebugDrawers();
const p1Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[0].x, boundaryObjs.playerStartingPositions[0].y);
const p2Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[1].x, boundaryObjs.playerStartingPositions[1].y);
@@ -159,7 +129,7 @@ cc.Class({
inAir: true,
}),
],
speciesIdList: [1, 0],
speciesIdList: [0, 1],
});
self.selfPlayerInfo = {

87
frontend/assets/scripts/modules/room_downsync_frame_proto_bundle.forcemsg.js
View File

@@ -1213,6 +1213,8 @@ $root.protos = (function() {
* @property {number|null} [framesInChState] PlayerDownsync framesInChState
* @property {number|null} [activeSkillId] PlayerDownsync activeSkillId
* @property {number|null} [activeSkillHit] PlayerDownsync activeSkillHit
* @property {number|null} [framesInvinsible] PlayerDownsync framesInvinsible
* @property {number|null} [framesSelfLockVel] PlayerDownsync framesSelfLockVel
* @property {string|null} [name] PlayerDownsync name
* @property {string|null} [displayName] PlayerDownsync displayName
* @property {string|null} [avatar] PlayerDownsync avatar
@@ -1409,6 +1411,22 @@ $root.protos = (function() {
*/
PlayerDownsync.prototype.activeSkillHit = 0;
/**
* PlayerDownsync framesInvinsible.
* @member {number} framesInvinsible
* @memberof protos.PlayerDownsync
* @instance
*/
PlayerDownsync.prototype.framesInvinsible = 0;
/**
* PlayerDownsync framesSelfLockVel.
* @member {number} framesSelfLockVel
* @memberof protos.PlayerDownsync
* @instance
*/
PlayerDownsync.prototype.framesSelfLockVel = 0;
/**
* PlayerDownsync name.
* @member {string} name
@@ -1501,6 +1519,10 @@ $root.protos = (function() {
writer.uint32(/* id 21, wireType 0 =*/168).int32(message.activeSkillId);
if (message.activeSkillHit != null && Object.hasOwnProperty.call(message, "activeSkillHit"))
writer.uint32(/* id 22, wireType 0 =*/176).int32(message.activeSkillHit);
if (message.framesInvinsible != null && Object.hasOwnProperty.call(message, "framesInvinsible"))
writer.uint32(/* id 23, wireType 0 =*/184).int32(message.framesInvinsible);
if (message.framesSelfLockVel != null && Object.hasOwnProperty.call(message, "framesSelfLockVel"))
writer.uint32(/* id 24, wireType 0 =*/192).int32(message.framesSelfLockVel);
if (message.name != null && Object.hasOwnProperty.call(message, "name"))
writer.uint32(/* id 997, wireType 2 =*/7978).string(message.name);
if (message.displayName != null && Object.hasOwnProperty.call(message, "displayName"))
@@ -1629,6 +1651,14 @@ $root.protos = (function() {
message.activeSkillHit = reader.int32();
break;
}
case 23: {
message.framesInvinsible = reader.int32();
break;
}
case 24: {
message.framesSelfLockVel = reader.int32();
break;
}
case 997: {
message.name = reader.string();
break;
@@ -1742,6 +1772,12 @@ $root.protos = (function() {
if (message.activeSkillHit != null && message.hasOwnProperty("activeSkillHit"))
if (!$util.isInteger(message.activeSkillHit))
return "activeSkillHit: integer expected";
if (message.framesInvinsible != null && message.hasOwnProperty("framesInvinsible"))
if (!$util.isInteger(message.framesInvinsible))
return "framesInvinsible: integer expected";
if (message.framesSelfLockVel != null && message.hasOwnProperty("framesSelfLockVel"))
if (!$util.isInteger(message.framesSelfLockVel))
return "framesSelfLockVel: integer expected";
if (message.name != null && message.hasOwnProperty("name"))
if (!$util.isString(message.name))
return "name: string expected";
@@ -1810,6 +1846,10 @@ $root.protos = (function() {
message.activeSkillId = object.activeSkillId | 0;
if (object.activeSkillHit != null)
message.activeSkillHit = object.activeSkillHit | 0;
if (object.framesInvinsible != null)
message.framesInvinsible = object.framesInvinsible | 0;
if (object.framesSelfLockVel != null)
message.framesSelfLockVel = object.framesSelfLockVel | 0;
if (object.name != null)
message.name = String(object.name);
if (object.displayName != null)
@@ -1855,6 +1895,8 @@ $root.protos = (function() {
object.framesInChState = 0;
object.activeSkillId = 0;
object.activeSkillHit = 0;
object.framesInvinsible = 0;
object.framesSelfLockVel = 0;
object.name = "";
object.displayName = "";
object.avatar = "";
@@ -1903,6 +1945,10 @@ $root.protos = (function() {
object.activeSkillId = message.activeSkillId;
if (message.activeSkillHit != null && message.hasOwnProperty("activeSkillHit"))
object.activeSkillHit = message.activeSkillHit;
if (message.framesInvinsible != null && message.hasOwnProperty("framesInvinsible"))
object.framesInvinsible = message.framesInvinsible;
if (message.framesSelfLockVel != null && message.hasOwnProperty("framesSelfLockVel"))
object.framesSelfLockVel = message.framesSelfLockVel;
if (message.name != null && message.hasOwnProperty("name"))
object.name = message.name;
if (message.displayName != null && message.hasOwnProperty("displayName"))
@@ -4042,6 +4088,7 @@ $root.protos = (function() {
* @property {number|null} [damage] MeleeBullet damage
* @property {number|null} [selfLockVelX] MeleeBullet selfLockVelX
* @property {number|null} [selfLockVelY] MeleeBullet selfLockVelY
* @property {number|null} [framesSelfLockVel] MeleeBullet framesSelfLockVel
* @property {number|null} [hitboxOffsetX] MeleeBullet hitboxOffsetX
* @property {number|null} [hitboxOffsetY] MeleeBullet hitboxOffsetY
* @property {number|null} [hitboxSizeX] MeleeBullet hitboxSizeX
@@ -4168,6 +4215,14 @@ $root.protos = (function() {
*/
MeleeBullet.prototype.selfLockVelY = 0;
/**
* MeleeBullet framesSelfLockVel.
* @member {number} framesSelfLockVel
* @memberof protos.MeleeBullet
* @instance
*/
MeleeBullet.prototype.framesSelfLockVel = 0;
/**
* MeleeBullet hitboxOffsetX.
* @member {number} hitboxOffsetX
@@ -4258,16 +4313,18 @@ $root.protos = (function() {
writer.uint32(/* id 12, wireType 0 =*/96).int32(message.selfLockVelX);
if (message.selfLockVelY != null && Object.hasOwnProperty.call(message, "selfLockVelY"))
writer.uint32(/* id 13, wireType 0 =*/104).int32(message.selfLockVelY);
if (message.framesSelfLockVel != null && Object.hasOwnProperty.call(message, "framesSelfLockVel"))
writer.uint32(/* id 14, wireType 0 =*/112).int32(message.framesSelfLockVel);
if (message.hitboxOffsetX != null && Object.hasOwnProperty.call(message, "hitboxOffsetX"))
writer.uint32(/* id 14, wireType 0 =*/112).int32(message.hitboxOffsetX);
writer.uint32(/* id 15, wireType 0 =*/120).int32(message.hitboxOffsetX);
if (message.hitboxOffsetY != null && Object.hasOwnProperty.call(message, "hitboxOffsetY"))
writer.uint32(/* id 15, wireType 0 =*/120).int32(message.hitboxOffsetY);
writer.uint32(/* id 16, wireType 0 =*/128).int32(message.hitboxOffsetY);
if (message.hitboxSizeX != null && Object.hasOwnProperty.call(message, "hitboxSizeX"))
writer.uint32(/* id 16, wireType 0 =*/128).int32(message.hitboxSizeX);
writer.uint32(/* id 17, wireType 0 =*/136).int32(message.hitboxSizeX);
if (message.hitboxSizeY != null && Object.hasOwnProperty.call(message, "hitboxSizeY"))
writer.uint32(/* id 17, wireType 0 =*/136).int32(message.hitboxSizeY);
writer.uint32(/* id 18, wireType 0 =*/144).int32(message.hitboxSizeY);
if (message.blowUp != null && Object.hasOwnProperty.call(message, "blowUp"))
writer.uint32(/* id 18, wireType 0 =*/144).bool(message.blowUp);
writer.uint32(/* id 19, wireType 0 =*/152).bool(message.blowUp);
return writer;
};
@@ -4355,22 +4412,26 @@ $root.protos = (function() {
break;
}
case 14: {
message.hitboxOffsetX = reader.int32();
message.framesSelfLockVel = reader.int32();
break;
}
case 15: {
message.hitboxOffsetY = reader.int32();
message.hitboxOffsetX = reader.int32();
break;
}
case 16: {
message.hitboxSizeX = reader.int32();
message.hitboxOffsetY = reader.int32();
break;
}
case 17: {
message.hitboxSizeY = reader.int32();
message.hitboxSizeX = reader.int32();
break;
}
case 18: {
message.hitboxSizeY = reader.int32();
break;
}
case 19: {
message.blowUp = reader.bool();
break;
}
@@ -4448,6 +4509,9 @@ $root.protos = (function() {
if (message.selfLockVelY != null && message.hasOwnProperty("selfLockVelY"))
if (!$util.isInteger(message.selfLockVelY))
return "selfLockVelY: integer expected";
if (message.framesSelfLockVel != null && message.hasOwnProperty("framesSelfLockVel"))
if (!$util.isInteger(message.framesSelfLockVel))
return "framesSelfLockVel: integer expected";
if (message.hitboxOffsetX != null && message.hasOwnProperty("hitboxOffsetX"))
if (!$util.isInteger(message.hitboxOffsetX))
return "hitboxOffsetX: integer expected";
@@ -4504,6 +4568,8 @@ $root.protos = (function() {
message.selfLockVelX = object.selfLockVelX | 0;
if (object.selfLockVelY != null)
message.selfLockVelY = object.selfLockVelY | 0;
if (object.framesSelfLockVel != null)
message.framesSelfLockVel = object.framesSelfLockVel | 0;
if (object.hitboxOffsetX != null)
message.hitboxOffsetX = object.hitboxOffsetX | 0;
if (object.hitboxOffsetY != null)
@@ -4544,6 +4610,7 @@ $root.protos = (function() {
object.damage = 0;
object.selfLockVelX = 0;
object.selfLockVelY = 0;
object.framesSelfLockVel = 0;
object.hitboxOffsetX = 0;
object.hitboxOffsetY = 0;
object.hitboxSizeX = 0;
@@ -4576,6 +4643,8 @@ $root.protos = (function() {
object.selfLockVelX = message.selfLockVelX;
if (message.selfLockVelY != null && message.hasOwnProperty("selfLockVelY"))
object.selfLockVelY = message.selfLockVelY;
if (message.framesSelfLockVel != null && message.hasOwnProperty("framesSelfLockVel"))
object.framesSelfLockVel = message.framesSelfLockVel;
if (message.hitboxOffsetX != null && message.hasOwnProperty("hitboxOffsetX"))
object.hitboxOffsetX = message.hitboxOffsetX;
if (message.hitboxOffsetY != null && message.hasOwnProperty("hitboxOffsetY"))