Fixed fireball rollback mechanism.

2025-10-09 16:46:38 +00:00 · 2023-01-13 11:25:20 +08:00
parent 29e402ea71
commit dd9c03404e
16 changed files with 7116 additions and 341 deletions
--- a/frontend/assets/plugin_scripts/jsexport.js
+++ b/frontend/assets/plugin_scripts/jsexport.js
--- a/frontend/assets/resources/animation/Fireball/Fireball1.anim
+++ b/frontend/assets/resources/animation/Fireball/Fireball1.anim
@@ -62,7 +62,7 @@
          {
            "frame": 0.13333333333333333,
            "value": {
-              "__uuid__": "2ad9becb-20e0-4bbb-b83b-de21e085e706"
+              "__uuid__": "dbe67025-9878-4e13-8f3d-81e04734810a"
            }
          },
          {
--- a/frontend/assets/resources/map/dungeon/map.tmx
+++ b/frontend/assets/resources/map/dungeon/map.tmx
@@ -5,14 +5,14 @@
 <tileset firstgid="129" source="tiles2.tsx"/>
 <layer id="6" name="Ground" width="128" height="64">
  <data encoding="base64" compression="zlib">
-   eJzt2z1uAjEURWELlIYuiKRHyk4iGjo2wP6XkRDGUmThnxne+FncU3wNEDJ+x3aqbEMIWwAAAAAAAAAAAADo4IQ/3h08+3s/gzflGSivnRlor50ZaK+dGdTX/mb0e6y+h/7+/Q+NHn1P6z7YG32G/svWXur1TP/SvqL/OP1LnSz6t7Qt9a29T//x+7fcASW9ZvDKWvpbmbPHRprBKxt97e8ZSjPo3f/L4TnSOyDXfY19QP+xtLa32gcjzsCjf+u5Pxp9ZhT0v9tN6K/jtvbvRLwH0tejY6Pcz48mzsC7hVf/zSSe/+uvc8bGQO5veO39pWrPo37+0/438Q74/5pV/9HQ/+6c9H7EevafK5h799A/b5eZmdX9W+u1ZD/NaU//ED4mpZk9c/5Le6DX+S/tT/rn+1so3QM9+tfuJ/X+8O/g2f8ijv7a6K+N/tror43+2uivjf7a6K+N/tror43+2uivjf7a6K+N/tror43+2uivjf7a6K+N/trory3+D5R3C/rTn/70790f6/X/AbS6syo=
+   eJzt2ztuAjEURmELlIYuiKRHyk4iGjo2wP6XkRDGUmThxwx3fC3+U3wNw8v3eEyabEMIWwAAAAAAAAAAAADo4IQ/3h08+3t/B2/KM1BeOzPQXjsz0F47M6iv/c3oc6zeh/7+/Q+NHr1P6z7YGz2H/svWXur1TP/SvqL/OP1LnSz6t7Qt9a1dp//4/VvOgJJeM3hlLf2tzNljI83glY2+9vcMpRko9E/PgFz3NfbBKDNQ7r+kvdU+GHEGHv2/Gl9zNHrOKOh/t5vQX8dt7d+JeC19PDo2yr1+NHEG3i28+m8m8f6//jpnbAzkfsNr15eqfR/1+z/tfxP/Fvj/mFX/0dD/7pz0fsR69p8rmHv20D9vl5mZ1flb67VkP81pT/8QPialmT1z/5f2QK/7v7Q/6Z/vb6F0DvToXzuf1PvDv4Nn/4s4+mujvzb6a6O/Nvpro782+mujvzb6a6O/Nvpro782+mujvzb6a6O/Nvpro782+mujvzb6a6O/tvg/UN4t6E9/+tO/d3+s1/8HUhSy6A==
  </data>
 </layer>
 <objectgroup id="1" name="PlayerStartingPos">
-  <object id="135" x="1630" y="518">
+  <object id="135" x="1140" y="488">
   <point/>
  </object>
-  <object id="137" x="888.003" y="535">
+  <object id="137" x="1527" y="488">
   <point/>
  </object>
 </objectgroup>
@@ -179,11 +179,6 @@
    <property name="boundary_type" value="barrier"/>
   </properties>
  </object>
-  <object id="126" x="720" y="480" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
  <object id="127" x="1088" y="320" width="16" height="16">
   <properties>
    <property name="boundary_type" value="barrier"/>
@@ -209,10 +204,5 @@
    <property name="boundary_type" value="barrier"/>
   </properties>
  </object>
-  <object id="134" x="720" y="416" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
 </objectgroup>
 </map>
--- a/frontend/assets/resources/prefabs/Fireball.prefab
+++ b/frontend/assets/resources/prefabs/Fireball.prefab
@@ -24,11 +24,11 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 6
+        "__id__": 7
      }
    ],
    "_prefab": {
-      "__id__": 7
+      "__id__": 8
    },
    "_opacity": 255,
    "_color": {
@@ -79,23 +79,20 @@
  },
  {
    "__type__": "cc.Node",
-    "_name": "Fireball1",
+    "_name": "animNode",
    "_objFlags": 0,
    "_parent": {
      "__id__": 1
    },
-    "_children": [],
-    "_active": false,
-    "_components": [
+    "_children": [
      {
        "__id__": 3
-      },
-      {
-        "__id__": 4
      }
    ],
+    "_active": true,
+    "_components": [],
    "_prefab": {
-      "__id__": 5
+      "__id__": 6
    },
    "_opacity": 255,
    "_color": {
@@ -145,20 +142,67 @@
    "_id": ""
  },
  {
-    "__type__": "cc.Animation",
-    "_name": "",
+    "__type__": "cc.Node",
+    "_name": "Fireball1",
    "_objFlags": 0,
-    "node": {
+    "_parent": {
      "__id__": 2
    },
-    "_enabled": true,
-    "_defaultClip": null,
-    "_clips": [
+    "_children": [],
+    "_active": true,
+    "_components": [
      {
-        "__uuid__": "ba12416b-eec3-4260-8402-7fc25b125624"
+        "__id__": 4
      }
    ],
-    "playOnLoad": false,
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 117,
+      "height": 55
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -32,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
    "_id": ""
  },
  {
@@ -166,13 +210,19 @@
    "_name": "",
    "_objFlags": 0,
    "node": {
-      "__id__": 2
+      "__id__": 3
    },
    "_enabled": true,
-    "_materials": [],
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
    "_srcBlendFactor": 770,
    "_dstBlendFactor": 771,
-    "_spriteFrame": null,
+    "_spriteFrame": {
+      "__uuid__": "e92702d5-d5fd-49e6-ab6b-2296b43fa6d6"
+    },
    "_type": 0,
    "_sizeMode": 1,
    "_fillType": 0,
@@ -197,7 +247,18 @@
    "asset": {
      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
    },
-    "fileId": "9ds3kDxvVFFqyr760jrV4a",
+    "fileId": "5f1s6pDt5F3rknJTu0gQW7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
+    "fileId": "3824oBeVVL1KOAQ6Zd9CC5",
    "sync": false
  },
  {
@@ -208,6 +269,9 @@
      "__id__": 1
    },
    "_enabled": true,
+    "animNode": {
+      "__id__": 2
+    },
    "_id": ""
  },
  {
--- a/frontend/assets/scenes/login.fire
+++ b/frontend/assets/scenes/login.fire
@@ -440,7 +440,7 @@
      "array": [
        0,
        0,
-        216.50635094610968,
+        215.94663282292512,
        0,
        0,
        0,
--- a/frontend/assets/scenes/offline_map.fire
+++ b/frontend/assets/scenes/offline_map.fire
@@ -191,8 +191,8 @@
        0,
        0,
        1,
-        1.2,
-        1.2,
+        0.8,
+        0.8,
        1
      ]
    },
@@ -464,7 +464,7 @@
      "array": [
        0,
        0,
-        209.57814771583418,
+        215.64032554232523,
        0,
        0,
        0,
--- a/frontend/assets/scripts/CameraTracker.js
+++ b/frontend/assets/scripts/CameraTracker.js
@@ -1,37 +1,34 @@
 cc.Class({
-    extends: cc.Component,
+  extends: cc.Component,

-    properties: {
-      mapNode: {
-        type: cc.Node,
-        default: null
-      },
-      speed: {
-        type: cc.Float,
-        default: 500
-      }, 
+  properties: {
+    mapNode: {
+      type: cc.Node,
+      default: null
    },
-
-    onLoad () {
-      this.mainCamera = this.mapNode.parent.getChildByName("Main Camera").getComponent(cc.Camera);
-      this.mapScriptIns = this.mapNode.getComponent("Map");
+    speed: {
+      type: cc.Float,
+      default: 500
    },
+  },

-    start() {},
+  onLoad() {
+    this.mainCamera = this.mapNode.parent.getChildByName("Main Camera").getComponent(cc.Camera);
+    this.mapScriptIns = this.mapNode.getComponent("Map");
+  },

-    update(dt) {
-      const self = this;
-      if (!self.mainCamera) return;
-      if (!self.mapScriptIns) return;
-      if (!self.mapScriptIns.selfPlayerInfo) return;
-      if (!self.mapScriptIns.playerRichInfoDict) return;
-      const selfPlayerRichInfo = self.mapScriptIns.playerRichInfoDict.get(self.mapScriptIns.selfPlayerInfo.Id);
-      if (!selfPlayerRichInfo) return;
-      const selfPlayerNode = selfPlayerRichInfo.node; 
-      if (!selfPlayerNode) return;
-      const pDiff = selfPlayerNode.position.sub(self.mainCamera.node.position); 
-      pDiff.normalizeSelf();
-      const newCamPos = self.mainCamera.node.position.add(pDiff.mul(dt*self.speed));
-      self.mainCamera.node.setPosition(newCamPos);
-    }
+  start() {},
+
+  update(dt) {
+    const self = this;
+    if (!self.mainCamera) return;
+    if (!self.mapScriptIns) return;
+    if (!self.mapScriptIns.selfPlayerInfo) return;
+    if (!self.mapScriptIns.playerRichInfoDict) return;
+    const selfPlayerRichInfo = self.mapScriptIns.playerRichInfoDict.get(self.mapScriptIns.selfPlayerInfo.Id);
+    if (!selfPlayerRichInfo) return;
+    const selfPlayerNode = selfPlayerRichInfo.node;
+    if (!selfPlayerNode) return;
+    self.mapNode.setPosition(cc.v2().sub(selfPlayerNode.position));
+  }
 });
--- a/frontend/assets/scripts/Fireball.js
+++ b/frontend/assets/scripts/Fireball.js
@@ -1,6 +1,13 @@
 cc.Class({
  extends: cc.Component,

+  properties: {
+    animNode: {
+      type: cc.Node,
+      default: null
+    },
+  },
+
  ctor() {
    this.lastUsed = -1;
    this.bulletLocalId = -1;
@@ -9,28 +16,30 @@ cc.Class({

  setSpecies(speciesName, fireballBullet, rdf) {
    if (speciesName == this.speciesName) return;
-    this.speciesName = speciesName;
-    this.effAnimNode = this.node.getChildByName(this.speciesName);
-    this.animComp = this.effAnimNode.getComponent(cc.Animation);
-    this.effAnimNode.active = true;
-    for (let k in this.children) {
-      const child = this.children[k];
-      if (!child.active) continue;
-      if (child == effAnimNode || child.name == speciesName) continue;
-      child.active = false;
+    if (null != this.speciesName) {
+      for (let k in this.animNode.children) {
+        const child = this.children[k];
+        if (!child.active) continue;
+        if (child == effAnimNode || child.name == speciesName) continue;
+        child.active = false;
+      }
    }
-    this.updateAnim(speciesName, fireballBullet, rdf);
+    this.speciesName = speciesName;
+    this.effAnimNode = this.animNode.getChildByName(this.speciesName);
+    this.effAnimNode.active = true;
+    //this.updateAnim(speciesName, fireballBullet, rdf);
  },

  onLoad() {},

  updateAnim(speciesName, fireballBullet, rdf) {
+    this.animComp = this.effAnimNode.getComponent(cc.Animation);
    // Update directions
    if (this.animComp && this.animComp.node) {
      if (0 > fireballBullet.DirX) {
-        this.effAnimNode.scaleX = (-1.0);
+        this.animNode.scaleX = (-1.0);
      } else if (0 < fireballBullet.DirX) {
-        this.effAnimNode.scaleX = (1.0);
+        this.animNode.scaleX = (1.0);
      }
    }

--- a/frontend/assets/scripts/Map.js
+++ b/frontend/assets/scripts/Map.js
@@ -413,7 +413,7 @@ cc.Class({
    window.mapIns = self;
    window.forceBigEndianFloatingNumDecoding = self.forceBigEndianFloatingNumDecoding;

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

    console.warn("+++++++ Map onLoad()");

@@ -1095,23 +1095,6 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame

  _renderFireballBullet(fireballBullet, rdf) {
    const self = this;
-    let pqNode = self.cachedFireballs.popAny(fireballBullet.Bullet.BulletLocalId);
-    const speciesName = `Fireball${fireballBullet.SpeciesId}`;
-
-    if (null == pqNode) {
-      pqNode = self.cachedFireballs.pop();
-    } else {
-      console.log(`Using a cached fireball node for rendering for bulletLocalId=${fireballBullet.Bullet.BulletLocalId}`);
-    }
-    const cachedFireball = pqNode.value;
-    cachedFireball.setSpecies(speciesName, fireballBullet, rdf);
-    cachedFireball.lastUsed = self.renderFrameId;
-    cachedFireball.bulletLocalId = fireballBullet.Bullet.BulletLocalId;
-
-    const [wx, wy] = gopkgs.VirtualGridToWorldPos(fireballBullet.VirtualGridX, fireballBullet.VirtualGridY);
-    cachedFireball.node.setPosition(cc.v2(wx, wy));
-
-    self.cachedFireballs.push(cachedFireball.lastUsed, cachedFireball, cachedFireball.bulletLocalId);
  },

  applyRoomDownsyncFrameDynamics(rdf, prevRdf) {
@@ -1137,8 +1120,28 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
    const fireballBullets = rdf.FireballBullets;
    for (let k in fireballBullets) {
      const fireballBullet = fireballBullets[k];
-      if ((fireballBullet.Bullet.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames <= rdf.Id) && (fireballBullet.Bullet.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames + fireballBullet.Bullet.ActiveFrames > rdf.Id)) {
-        self._renderFireballBullet(fireballBullet, rdf);
+      if (
+        fireballBullet.Bullet.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames <= rdf.Id
+        &&
+        fireballBullet.Bullet.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames + fireballBullet.Bullet.ActiveFrames > rdf.Id
+      ) {
+        let pqNode = self.cachedFireballs.popAny(fireballBullet.Bullet.BulletLocalId);
+        const speciesName = `Fireball${fireballBullet.SpeciesId}`;
+        const [wx, wy] = gopkgs.VirtualGridToWorldPos(fireballBullet.VirtualGridX, fireballBullet.VirtualGridY);
+
+        if (null == pqNode) {
+          pqNode = self.cachedFireballs.pop();
+          console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.Bullet.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, activeFrames=${fireballBullet.Bullet.ActiveFrames}, using a new fireball node for rendering for bulletLocalId=${fireballBullet.Bullet.BulletLocalId} at wpos=(${wx},${wy})`);
+        } else {
+          console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.Bullet.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, activeFrames=${fireballBullet.Bullet.ActiveFrames}, using a cached fireball node for rendering for bulletLocalId=${fireballBullet.Bullet.BulletLocalId} at wpos=(${wx},${wy})`);
+        }
+        const cachedFireball = pqNode.value;
+        cachedFireball.setSpecies(speciesName, fireballBullet, rdf);
+        cachedFireball.lastUsed = self.renderFrameId;
+        cachedFireball.bulletLocalId = fireballBullet.Bullet.BulletLocalId;
+        cachedFireball.node.setPosition(cc.v2(wx, wy));
+
+        self.cachedFireballs.push(cachedFireball.lastUsed, cachedFireball, fireballBullet.Bullet.BulletLocalId);
      }
    }

@@ -1263,7 +1266,12 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame

  playerDownsyncStr(playerDownsync) {
    if (null == playerDownsync) return "";
-    return `{${playerDownsync.JoinIndex},${playerDownsync.VirtualGridX},${playerDownsync.VirtualGridY},${playerDownsync.VelX},${playerDownsync.VelY},${playerDownsync.FramesToRecover},${playerDownsync.InAir ? 1 : 0}}`;
+    return `{${playerDownsync.JoinIndex},${playerDownsync.VirtualGridX},${playerDownsync.VirtualGridY},${playerDownsync.VelX},${playerDownsync.VelY},${playerDownsync.FramesToRecover},${playerDownsync.InAir ? 1 : 0},${playerDownsync.OnWall ? 1 : 0}}`;
+  },
+
+  fireballDownsyncStr(fireball) {
+    if (null == fireball) return "";
+    return `{${fireball.Bullet.BulletLocalId},${fireball.Bullet.OriginatedRenderFrameId},${fireball.Bullet.OffenderJoinIndex},${fireball.VirtualGridX},${fireball.VirtualGridY},${fireball.VelX},${fireball.VelY},${fireball.DirX},${fireball.DirY},${fireball.Bullet.HitboxSizeX},${fireball.Bullet.HitboxSizeY}}`;
  },

  inputFrameDownsyncStr(inputFrameDownsync) {
@@ -1292,8 +1300,13 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
      for (let k in rdf.PlayersArr) {
        playersStrBldr.push(self.playerDownsyncStr(rdf.PlayersArr[k]));
      }
+      const fireballsStrBldr = [];
+      for (let k in rdf.FireballBullets) {
+        fireballsStrBldr.push(self.fireballDownsyncStr(rdf.FireballBullets[k]));
+      }
      s.push(`rdfId:${i}
 players:[${playersStrBldr.join(',')}]
+fireballs:[${fireballsStrBldr.join(',')}]
 actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
    }

--- a/frontend/assets/scripts/OfflineMap.js
+++ b/frontend/assets/scripts/OfflineMap.js
@@ -94,7 +94,7 @@ cc.Class({
      const p2Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[1].x, boundaryObjs.playerStartingPositions[1].y);
      const colliderRadiusV = gopkgs.WorldToVirtualGridPos(12.0, 0);

-      const speciesIdList = [1, 4096];
+      const speciesIdList = [4096, 1];
      const chConfigsOrderedByJoinIndex = gopkgs.GetCharacterConfigsOrderedByJoinIndex(speciesIdList);

      const startRdf = window.pb.protos.RoomDownsyncFrame.create({