feat: 鼠标控制链路优化

Author: ra2web-bot

dist/ra2web.min.js

@@ -5882,6 +5882,7 @@ System.register("data/CsfFile", [], function (t, e) {
             }
             fromVirtualFile(e) {
               let t = e.stream;
+              t.seek(0);
               (t.readInt32(), t.readInt32());
               var i = t.readInt32();
               (t.readInt32(), t.readInt32(), (this.language = t.readInt32()));
@@ -65197,17 +65198,26 @@ System.register(
                   timeStamp: t.timeStamp
                 };
               }
-              computeTouchPosition(e) {
-                let t = {
-                  x: (e.pageX - this.canvasMetrics.x) * (this.canvasMetrics.scaleX ?? 1),
-                  y: (e.pageY - this.canvasMetrics.y) * (this.canvasMetrics.scaleY ?? 1)
+              computeCanvasPosition(e, t) {
+                let r = {
+                  x: (e - this.canvasMetrics.x) * (this.canvasMetrics.scaleX ?? 1),
+                  y: (t - this.canvasMetrics.y) * (this.canvasMetrics.scaleY ?? 1)
                 };
                 return (
-                  (t.x = i.clamp(t.x, 0, this.canvasMetrics.width - 1)),
-                  (t.y = i.clamp(t.y, 0, this.canvasMetrics.height - 1)),
-                  t
+                  (r.x = i.clamp(r.x, 0, this.canvasMetrics.width - 1)),
+                  (r.y = i.clamp(r.y, 0, this.canvasMetrics.height - 1)),
+                  r
                 );
               }
+              computeTouchPosition(e) {
+                return this.computeCanvasPosition(e.pageX, e.pageY);
+              }
+              computeMousePosition(e) {
+                var t = this.document?.defaultView,
+                  r = "number" == typeof e.pageX ? e.pageX : (e.clientX ?? 0) + (t?.scrollX ?? 0),
+                  s = "number" == typeof e.pageY ? e.pageY : (e.clientY ?? 0) + (t?.scrollY ?? 0);
+                return this.computeCanvasPosition(r, s);
+              }
               onMouseEvent(t, r) {
                 let s = this.getPointerPosition(r);
                 var a = this.findObjectUnderPointer(s);
@@ -65246,10 +65256,9 @@ System.register(
               getPointerPosition(e) {
                 return this.document.pointerLockElement
                   ? this.lockModePointer
-                  : {
-                      x: e.isTouch ? e.offsetX : e.offsetX * (this.canvasMetrics.scaleX ?? 1),
-                      y: e.isTouch ? e.offsetY : e.offsetY * (this.canvasMetrics.scaleY ?? 1)
-                    };
+                  : e.isTouch
+                    ? { x: e.offsetX, y: e.offsetY }
+                    : this.computeMousePosition(e);
               }
               findObjectUnderPointer(t) {
                 let r = this.renderer.getScenes(),
@@ -112380,16 +112389,20 @@ System.register(
                 (G.ImageContext.cdnBaseUrl = this.gameResConfig.isCdn() ? this.gameResConfig.getCdnBaseUrl() : void 0),
                 (G.ImageContext.vfs = u.Engine.vfs));
               try {
-                let e = new X.CsfFile(u.Engine.vfs.openFile(u.Engine.getFileNameVariant("ra2.csf")));
+                let e,
+                  n = u.Engine.getFileNameVariant("ra2.csf"),
+                  o = this.getStringsFileLayers(n);
+                if (!o.length) throw new Error(`String file "${n}" not found in VFS`);
+                e = new X.CsfFile(this.resetVirtualFileStream(o[0].file));
                 var l = e.getIsoLocale();
                 if (void 0 !== l && l !== t)
                   try {
                     ((i = await this.loadTranslations(l)), (this.locale = l));
                   } catch (e) {
                     console.warn(`Failed to load translation ${l}. Falling back to ${t}.`, e);
                   }
-                ((r = this.strings = new R.Strings(e)),
-                  r.fromJson(i),
+                (1 < o.length && console.info("[strings] layered string sources", o.map((e) => e.archiveName)),
+                  (r = this.strings = this.buildLayeredStrings(o, i)),
                   u.Engine.loadRules(),
                   this.sentry?.configureScope((e) => {
                     (e.setTag("mod", u.Engine.getActiveMod() || "<none>"),
@@ -112424,6 +112437,36 @@ System.register(
               }
               (await e, a.destroy(), (this.splashScreen = void 0), this.initRouting());
             }
+            resetVirtualFileStream(e) {
+              return (e?.stream?.seek?.(0), e);
+            }
+            getStringsFileLayers(e) {
+              let t = [],
+                i = u.Engine.vfs,
+                r = i?.archivesByPriority,
+                s = i?.allArchives;
+              if (!Array.isArray(r) || !s?.entries) return t;
+              let a = new Map();
+              for (var [n, o] of s.entries()) a.set(o, n);
+              for (var l of r)
+                try {
+                  if (l?.containsFile?.(e)) {
+                    var c = l.openFile(e);
+                    (this.resetVirtualFileStream(c),
+                      t.push({ archiveName: a.get(l) || "(unknown)", file: c }));
+                  }
+                } catch (t) {
+                  throw new Error(`Failed to read string file "${e}" from VFS archive "${a.get(l) || "(unknown)"}"`, {
+                    cause: t
+                  });
+                }
+              return t;
+            }
+            buildLayeredStrings(e, t) {
+              let i = new R.Strings();
+              for (var r of [...e].reverse()) i.fromCsf(new X.CsfFile(this.resetVirtualFileStream(r.file)));
+              return (i.fromJson(t), i);
+            }
             async loadTranslations(e) {
               return await new T.ResourceLoader(ie.resPath).loadJson(`locale/${e}.json?v=` + this.getVersion());
             }