Fixes for bullet and anim offset.

2024-12-26 03:39:00 +00:00 · 2022-12-15 12:28:39 +08:00 · 2022-12-15 12:28:39 +08:00 · b41b86bbd3
commit b41b86bbd3
parent db2bc0e3cd
9 changed files with 58 additions and 59 deletions
--- a/battle_srv/models/room.go
+++ b/battle_srv/models/room.go
@ -791,7 +791,7 @@ func (pR *Room) OnDismissed() {
 	pR.SnapIntoPlatformThreshold = float64(0.5)
 	pR.JumpingInitVelY = int32(float64(7) * pR.WorldToVirtualGridRatio)
 	pR.GravityX = 0
-	pR.GravityY = -int32(float64(0.5)*pR.WorldToVirtualGridRatio) // makes all "playerCollider.Y" a multiple of 0.5 in all cases 
+	pR.GravityY = -int32(float64(0.5) * pR.WorldToVirtualGridRatio) // makes all "playerCollider.Y" a multiple of 0.5 in all cases

 	pR.ChooseStage()
 	pR.EffectivePlayerCount = 0
@ -1607,7 +1607,7 @@ func (pR *Room) applyInputFrameDownsyncDynamicsOnSingleRenderFrame(delayedInputF

 		if 1 == thatPlayerInNextFrame.JoinIndex {
 			if thatPlayerInNextFrame.InAir && (0 != thatPlayerInNextFrame.VelY) {
-			    Logger.Info(fmt.Sprintf("playerId=%d, joinIndex=%d inAir trajectory: {nextRenderFrame.id: %d, nextVirtualX: %d, nextVirtualY: %d, nextVelX: %d, nextVelY: %d}, with playerColliderPos={%.3f, %.3f}, effPushback={%.3f, %.3f}", playerId, joinIndex, currRenderFrame.Id+1, thatPlayerInNextFrame.VirtualGridX, thatPlayerInNextFrame.VirtualGridY, thatPlayerInNextFrame.VelX, thatPlayerInNextFrame.VelY, playerShape.X-pR.collisionSpaceOffsetX, playerShape.Y-pR.collisionSpaceOffsetY, effPushbacks[joinIndex-1].X, effPushbacks[joinIndex-1].Y))
+				// Logger.Info(fmt.Sprintf("playerId=%d, joinIndex=%d inAir trajectory: {nextRenderFrame.id: %d, nextVirtualX: %d, nextVirtualY: %d, nextVelX: %d, nextVelY: %d}, with playerColliderPos={%.3f, %.3f}, effPushback={%.3f, %.3f}", playerId, joinIndex, currRenderFrame.Id+1, thatPlayerInNextFrame.VirtualGridX, thatPlayerInNextFrame.VirtualGridY, thatPlayerInNextFrame.VelX, thatPlayerInNextFrame.VelY, playerShape.X-pR.collisionSpaceOffsetX, playerShape.Y-pR.collisionSpaceOffsetY, effPushbacks[joinIndex-1].X, effPushbacks[joinIndex-1].Y))
 			}
 			if currPlayerDownsync.InAir && !thatPlayerInNextFrame.InAir {
 				Logger.Warn(fmt.Sprintf("playerId=%d, joinIndex=%d fallStopping#2 at {nextRenderFrame.id: %d, nextVirtualX: %d, nextVirtualY: %d, nextVelX: %d, nextVelY: %d}, with playerColliderPos={%.3f, %.3f}, effPushback={%.3f, %.3f}", playerId, joinIndex, currRenderFrame.Id+1, thatPlayerInNextFrame.VirtualGridX, thatPlayerInNextFrame.VirtualGridY, thatPlayerInNextFrame.VelX, thatPlayerInNextFrame.VelY, playerShape.X-pR.collisionSpaceOffsetX, playerShape.Y-pR.collisionSpaceOffsetY, effPushbacks[joinIndex-1].X, effPushbacks[joinIndex-1].Y))
--- a/collider_visualizer/worldColliderDisplay.go
+++ b/collider_visualizer/worldColliderDisplay.go
@ -35,7 +35,7 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi
 	spaceOffsetY := float64(spaceH) * 0.5

 	worldToVirtualGridRatio := float64(1000)
-	virtualGridToWorldRatio := float64(1)/worldToVirtualGridRatio
+	virtualGridToWorldRatio := float64(1) / worldToVirtualGridRatio
 	playerDefaultSpeed := 1 * worldToVirtualGridRatio
 	minStep := (int(float64(playerDefaultSpeed)*virtualGridToWorldRatio) << 2)
 	playerColliderRadius := float64(12)
@ -114,7 +114,7 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi
 		ReleaseTriggerType: int32(1), // 1: rising-edge, 2: falling-edge
 		Damage:             int32(5),
 	}
-	bulletLeftToRight := false
+	bulletLeftToRight := true
 	if bulletLeftToRight {
 		xfac := float64(1.0)
 		offenderWx, offenderWy := playerPosList.Eles[0].X, playerPosList.Eles[0].Y
@ -137,7 +137,7 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi
 		}
 	}

-	bulletRightToLeft := false
+	bulletRightToLeft := true
 	if bulletRightToLeft {
 		xfac := float64(-1.0)
 		offenderWx, offenderWy := playerPosList.Eles[1].X, playerPosList.Eles[1].Y
--- a/frontend/assets/resources/prefabs/ControlledCharacter.prefab
+++ b/frontend/assets/resources/prefabs/ControlledCharacter.prefab
@ -97,7 +97,7 @@
      "__id__": 1
    },
    "_children": [],
-    "_active": true,
+    "_active": false,
    "_components": [
      {
        "__id__": 3
@ -587,7 +587,7 @@
      "ctor": "Float64Array",
      "array": [
        0,
-        -10,
+        -24,
        0,
        0,
        0,
@ -702,7 +702,7 @@
      "ctor": "Float64Array",
      "array": [
        0,
-        -10,
+        -24,
        0,
        0,
        0,
@ -820,7 +820,7 @@
      "ctor": "Float64Array",
      "array": [
        0,
-        -12,
+        0,
        0,
        0,
        0,
--- a/frontend/assets/scenes/login.fire
+++ b/frontend/assets/scenes/login.fire
@ -440,7 +440,7 @@
      "array": [
        0,
        0,
-        209.7905580006813,
+        216.67520680312998,
        0,
        0,
        0,
--- a/frontend/assets/scenes/offline_map_1.fire
+++ b/frontend/assets/scenes/offline_map_1.fire
@ -454,7 +454,7 @@
      "array": [
        0,
        0,
-        209.7905580006813,
+        216.67520680312998,
        0,
        0,
        0,
--- a/frontend/assets/scripts/AttackingCharacter.js
+++ b/frontend/assets/scripts/AttackingCharacter.js
@ -81,7 +81,6 @@ cc.Class({
    this.animComp = this.effAnimNode.getComponent(dragonBones.ArmatureDisplay);
    if (!this.animComp) {
      this.animComp = this.effAnimNode.getComponent(cc.Animation);
-    this.effAnimNode.anchorY = 0.0; // Otherwise the anim will show with an incorrect y-offset even if the collider boundaries are all correct!
    } 
    this.effAnimNode.active = true;
  },
--- a/frontend/assets/scripts/Map.js
+++ b/frontend/assets/scripts/Map.js
@ -331,7 +331,7 @@ cc.Class({
    window.mapIns = self;
    window.forceBigEndianFloatingNumDecoding = self.forceBigEndianFloatingNumDecoding;

-    self.showCriticalCoordinateLabels = true;
+    self.showCriticalCoordinateLabels = false;

    console.warn("+++++++ Map onLoad()");
    window.handleClientSessionError = function() {
@ -778,7 +778,7 @@ cc.Class({
    if (1 == joinIndex) {
      playerScriptIns.setSpecies("SoldierWaterGhost");
    } else if (2 == joinIndex) {
-      playerScriptIns.setSpecies("SoldierFireGhost");
+      playerScriptIns.setSpecies("SoldierFireGhostFrameAnim");
    }

    const [wx, wy] = self.virtualGridToWorldPos(vx, vy);
@ -786,8 +786,8 @@ cc.Class({
    playerScriptIns.mapNode = self.node;
    const colliderWidth = playerDownsyncInfo.colliderRadius * 2,
      colliderHeight = playerDownsyncInfo.colliderRadius * 4;
-    const cpos = self.virtualGridToPolygonColliderTLPos(vx, vy, colliderWidth*0.5, colliderHeight*0.5); // the top-left corner is kept having integer coords
-    const pts = [[0, 0], [colliderWidth, 0], [colliderWidth, -colliderHeight-self.snapIntoPlatformOverlap], [0, -colliderHeight-self.snapIntoPlatformOverlap]];
+    const cpos = self.virtualGridToPolygonColliderTLPos(vx, vy, colliderWidth * 0.5, colliderHeight * 0.5); // the top-left corner is kept having integer coords
+    const pts = [[0, 0], [colliderWidth, 0], [colliderWidth, -colliderHeight - self.snapIntoPlatformOverlap], [0, -colliderHeight - self.snapIntoPlatformOverlap]];

    // [WARNING] The animNode "anchor & offset" are tuned to fit in this collider by "ControlledCharacter prefab & AttackingCharacter.js"! 
    const newPlayerCollider = self.collisionSys.createPolygon(cpos[0], cpos[1], pts);
@ -1047,15 +1047,15 @@ cc.Class({
          }
          const [offenderWx, offenderWy] = self.virtualGridToWorldPos(offender.virtualGridX, offender.virtualGridY);
          const bulletWx = offenderWx + xfac * meleeBullet.hitboxOffset;
-          const bulletWy = offenderWy + 0.5 * meleeBullet.hitboxSize.y;
-          const [bulletCx, bulletCy] = self.worldToPolygonColliderTLPos(bulletWx, bulletWy, meleeBullet.hitboxSize.x * 0.5, meleeBullet.hitboxSize.y * 0.5);
+          const bulletWy = offenderWy;
+          const bulletCpos = self.worldToPolygonColliderTLPos(bulletWx, bulletWy, meleeBullet.hitboxSize.x * 0.5, meleeBullet.hitboxSize.y * 0.5);
          const pts = [[0, 0], [meleeBullet.hitboxSize.x, 0], [meleeBullet.hitboxSize.x, -meleeBullet.hitboxSize.y], [0, -meleeBullet.hitboxSize.y]];

-          g.moveTo(bulletCx, bulletCy);
+          g.moveTo(bulletCpos[0], bulletCpos[1]);
          for (let j = 0; j < pts.length; j += 1) {
-            g.lineTo(pts[j][0] + bulletCx, pts[j][1] + bulletCy);
+            g.lineTo(pts[j][0] + bulletCpos[0], pts[j][1] + bulletCpos[1]);
          }
-          g.lineTo(bulletCx, bulletCy);
+          g.lineTo(bulletCpos[0], bulletCpos[1]);
          g.stroke();
        }
      }
@ -1191,7 +1191,7 @@ cc.Class({
      const [newVx, newVy] = [currPlayerDownsync.virtualGridX + currPlayerDownsync.velX, currPlayerDownsync.virtualGridY + currPlayerDownsync.velY];
      const colliderWidth = self.playerRichInfoArr[joinIndex - 1].colliderRadius * 2,
        colliderHeight = self.playerRichInfoArr[joinIndex - 1].colliderRadius * 4;
-      const newCpos = self.virtualGridToPolygonColliderTLPos(newVx, newVy, colliderWidth*0.5, colliderHeight*0.5);
+      const newCpos = self.virtualGridToPolygonColliderTLPos(newVx, newVy, colliderWidth * 0.5, colliderHeight * 0.5);
      playerCollider.x = newCpos[0];
      playerCollider.y = newCpos[1];

@ -1222,10 +1222,10 @@ cc.Class({
        }
        const [offenderWx, offenderWy] = self.virtualGridToWorldPos(offender.virtualGridX, offender.virtualGridY);
        const bulletWx = offenderWx + xfac * meleeBullet.hitboxOffset;
-        const bulletWy = offenderWy + 0.5 * meleeBullet.hitboxSize.y;
-        const [bulletCx, bulletCy] = self.worldToPolygonColliderTLPos(bulletWx, bulletWy, meleeBullet.hitboxSize.x * 0.5, meleeBullet.hitboxSize.y * 0.5),
+        const bulletWy = offenderWy;
+        const bulletCpos = self.worldToPolygonColliderTLPos(bulletWx, bulletWy, meleeBullet.hitboxSize.x * 0.5, meleeBullet.hitboxSize.y * 0.5),
          pts = [[0, 0], [meleeBullet.hitboxSize.x, 0], [meleeBullet.hitboxSize.x, -meleeBullet.hitboxSize.y], [0, -meleeBullet.hitboxSize.y]];
-        const newBulletCollider = collisionSys.createPolygon(bulletCx, bulletCy, pts);
+        const newBulletCollider = collisionSys.createPolygon(bulletCpos[0], bulletCpos[1], pts);
        newBulletCollider.data = meleeBullet;
        collisionSysMap.set(collisionBulletIndex, newBulletCollider);
        bulletColliders.set(collisionBulletIndex, newBulletCollider);
@ -1380,13 +1380,13 @@ cc.Class({
      const thatPlayerInNextFrame = nextRenderFramePlayers[playerId];
      const colliderWidth = self.playerRichInfoArr[joinIndex - 1].colliderRadius * 2,
        colliderHeight = self.playerRichInfoArr[joinIndex - 1].colliderRadius * 4;
-      const newVpos = self.polygonColliderTLToVirtualGridPos(playerCollider.x - effPushbacks[joinIndex - 1][0], playerCollider.y - effPushbacks[joinIndex - 1][1], colliderWidth*0.5, colliderHeight*0.5);
+      const newVpos = self.polygonColliderTLToVirtualGridPos(playerCollider.x - effPushbacks[joinIndex - 1][0], playerCollider.y - effPushbacks[joinIndex - 1][1], colliderWidth * 0.5, colliderHeight * 0.5);
      thatPlayerInNextFrame.virtualGridX = newVpos[0];
      thatPlayerInNextFrame.virtualGridY = newVpos[1];

      if (1 == thatPlayerInNextFrame.joinIndex) {
        if (thatPlayerInNextFrame.inAir && 0 != thatPlayerInNextFrame.velY) {
-          console.log(`playerId=${playerId}, joinIndex=${thatPlayerInNextFrame.joinIndex} inAir trajectory: {nextRenderFrame.id: ${currRenderFrame.id + 1}, nextVirtualX: ${thatPlayerInNextFrame.virtualGridX}, nextVirtualY: ${thatPlayerInNextFrame.virtualGridY}, nextVelX: ${thatPlayerInNextFrame.velX}, nextVelY: ${thatPlayerInNextFrame.velY}}, with playerColliderPos={${playerCollider.x.toFixed(3)}, ${playerCollider.y.toFixed(3)}}, effPushback={${effPushbacks[joinIndex - 1][0].toFixed(3)}, ${effPushbacks[joinIndex - 1][1].toFixed(3)}}`);
+          // console.log(`playerId=${playerId}, joinIndex=${thatPlayerInNextFrame.joinIndex} inAir trajectory: {nextRenderFrame.id: ${currRenderFrame.id + 1}, nextVirtualX: ${thatPlayerInNextFrame.virtualGridX}, nextVirtualY: ${thatPlayerInNextFrame.virtualGridY}, nextVelX: ${thatPlayerInNextFrame.velX}, nextVelY: ${thatPlayerInNextFrame.velY}}, with playerColliderPos={${playerCollider.x.toFixed(3)}, ${playerCollider.y.toFixed(3)}}, effPushback={${effPushbacks[joinIndex - 1][0].toFixed(3)}, ${effPushbacks[joinIndex - 1][1].toFixed(3)}}`);
        }
        if (currPlayerDownsync.inAir && !thatPlayerInNextFrame.inAir) {
          console.warn(`playerId=${playerId}, joinIndex=${thatPlayerInNextFrame.joinIndex} fallStopping#2 at {nextRenderFrame.id: ${currRenderFrame.id + 1}, nextVirtualX: ${thatPlayerInNextFrame.virtualGridX}, nextVirtualY: ${thatPlayerInNextFrame.virtualGridY}, nextVelX: ${thatPlayerInNextFrame.velX}, nextVelY: ${thatPlayerInNextFrame.velY}}, with playerColliderPos={${playerCollider.x.toFixed(3)}, ${playerCollider.y.toFixed(3)}}, effPushback={${effPushbacks[joinIndex - 1][0].toFixed(3)}, ${effPushbacks[joinIndex - 1][1].toFixed(3)}}`);
--- a/frontend/assets/scripts/OfflineMap.js
+++ b/frontend/assets/scripts/OfflineMap.js
@ -196,7 +196,7 @@ cc.Class({
        }
      });
      self.selfPlayerInfo = {
-        id: 10
+        id: 11
      };
      self._initPlayerRichInfoDict(startRdf.players);
      self.onRoomDownsyncFrame(startRdf);