xvai-loi 0.1.84 → 0.1.86

package/co.txt

@@ -1 +1 @@
-xvaiLoi120106
+xvaiLoi120301

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xvai-loi",
-  "version": "0.1.84",
+  "version": "0.1.86",
   "description": "Loi dung video (Edit Video Tu Dong) nap vao tool Google Flow qua o cam engine/oCam.ts",
   "license": "UNLICENSED",
   "type": "module",

package/xvai-loi.js

@@ -10855,14 +10855,14 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
     if (hv2 > 0) g.drawImage(vt, W4 / 2 - wv / 2, yv - hv2 / 2, wv, hv2);
     g.restore();
   }
-  const t2 = d.tieu ? haiDong4(g, String(d.tieu), 122 * H2 / 1920, 0.76 * W4, KHUON_TOPN.chu.caoMin / 0.92 * H2, 0.05 * H2) : null;
-  if (t2) chu2(g, t2[0], W4 / 2, (t2[2] ? 0.118 : 0.135) * H2 + (1 - ka) * 70 * H2 / 1920, t2[1], "brand", kep12(tuoi / 0.15), 0.76 * W4);
+  const t2 = d.tieu ? haiDong4(g, String(d.tieu), 122 * H2 / 1920, 0.76 * W4, KHUON_TOPN.chu.caoMin / 0.92 * H2, 0.046 * H2) : null;
+  if (t2) chu2(g, t2[0], W4 / 2, (t2[2] ? 0.15 : 0.135) * H2 + (1 - ka) * 70 * H2 / 1920, t2[1], "brand", kep12(tuoi / 0.15), 0.76 * W4);
   if (d.so) {
     g.save();
     g.globalAlpha = a * kep12((tuoi - 0.15) / 0.2);
     g.font = "900 " + (0.02 * H2).toFixed(1) + "px " + FB;
     const t = (d.nhom || "M\u1EE4C") + " " + d.so + "/" + d.N, tw = g.measureText(t).width + 0.05 * W4;
-    const dy = t2 && t2[2] ? 0.01 * H2 : 0;
+    const dy = t2 && t2[2] ? 0.04 * H2 : 0;
     bo(g, W4 / 2 - tw / 2, 0.172 * H2 + dy, tw, 0.034 * H2, 0.017 * H2);
     g.fillStyle = "rgba(20,20,26,0.85)";
     g.fill();
@@ -10874,11 +10874,11 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
   }
   if (d.ui) theUI(g, d.ui, tuoi, W4, H2, 1);
   if (d.hang) {
-    let yh = d.so ? 0.23 : 0.17, kh = 1;
+    let yh = (d.so ? 0.23 : 0.17) + (t2 && t2[2] ? 0.04 : 0), kh = 1;
     const L2 = luoiNguoi2(p || (nen2 ? nguoi(nen2, W4, H2) : null), d), F2 = F || (nen2 ? dauCanh(d, nen2, W4, H2) : null);
     if (L2 && F2) {
       const tt = d.bo === "cut" && p ? THU_HANG : 1, Lt = tt < 1 ? thuLuoi(L2, tt) : L2, Ft = tt < 1 ? [0.5 + tt * (F2[0] - 0.5), 1 - tt * (1 - F2[1]), 0.5 + tt * (F2[2] - 0.5), 1 - tt * (1 - F2[3])] : F2;
-      const nr = Math.ceil(d.hang.length / (d.hang.length > 3 ? 2 : 1)), hb2 = nr * 0.078, c = datKhoiChu({ luoi: Lt, mat: [Ft[0], Ft[1] + 0.25 * (Ft[3] - Ft[1]), Ft[2], Ft[3]], dinh: Ft[1], cam: Ft[3] }, { h: hb2, w: d.hang.length > 3 ? 0.87 : 0.7 }, false, false, void 0, false, W4 / H2, [[0, 0, 1, d.so ? 0.21 : 0.17]]);
+      const nr = Math.ceil(d.hang.length / (d.hang.length > 3 ? 2 : 1)), hb2 = nr * 0.078, c = datKhoiChu({ luoi: Lt, mat: [Ft[0], Ft[1] + 0.25 * (Ft[3] - Ft[1]), Ft[2], Ft[3]], dinh: Ft[1], cam: Ft[3] }, { h: hb2, w: d.hang.length > 3 ? 0.87 : 0.7 }, false, false, void 0, false, W4 / H2, [[0, 0, 1, (d.so ? 0.21 : 0.17) + (t2 && t2[2] ? 0.04 : 0)]]);
       if (c.k > 0) {
         kh = c.k;
         yh = c.y - hb2 * c.k / 2;
@@ -12947,6 +12947,15 @@ function lapCuongMe(o) {
           sp.splice(i, 1);
         }
       }
+      sp.forEach((x) => {
+        const c2 = nt(x.chu2), c1 = nt(x.giant || x.chu || x.tieu);
+        if (!c2 || !c1) return;
+        const W1 = new Set(c1.split(/\s+/));
+        if (c2.split(/\s+/).every((w) => W1.has(w))) {
+          ghiL("doi", x, "chu2 trung y chu chinh: " + String(x.chu2).slice(0, 20));
+          x.chu2 = "";
+        }
+      });
     }
     {
       sp.sort((p, q) => p.f - q.f);
@@ -13077,7 +13086,7 @@ function lapCuongMe(o) {
       G4.__doiNguoiBo = nD;
     }
     {
-      const coC = (x) => x.bo !== "phong" && !!String(x.giant || x.chu || x.tieu || "").trim(), C2 = sp.filter(coC).sort((p, q) => p.f - q.f), tran = Math.floor(0.9 * KHUON_TOPN.chu.phut[1] * tong / 60);
+      const coC = (x) => x.bo !== "phong" && (!!String(x.giant || x.chu || x.tieu || "").trim() || x.bo === "kinh" && Array.isArray(x.dong) && x.dong.length > 0), C2 = sp.filter(coC).sort((p, q) => p.f - q.f), tran = Math.floor(0.9 * KHUON_TOPN.chu.phut[1] * tong / 60);
       let nT = 0;
       while (C2.length > tran) {
         let j = -1, m = 1e9;
@@ -13239,6 +13248,10 @@ function lapCuongMe(o) {
       }
     });
     if (s.bo === "card" || s.bo === "cut" || s.bo === "chia") (ms || []).forEach((q) => {
+      if (q.kind === "sub" && q.t0 >= b - 0.06 && q.t0 < b + 0.04 && q.t1 > b + 0.2) {
+        q.t0 = +(b + 0.04).toFixed(3);
+        return;
+      }
       if (q.kind === "sub" && q.t0 >= a - 0.2 && q.t0 < b && q.t1 <= b + 0.05) q.safeY = s.bo === "chia" ? 0.47 : s.bo === "card" ? 0.87 : 0.775;
       else if (s.bo === "chia" && q.kind === "sub" && q.t1 > a && q.t0 < b) q.safeY = 0.79;
     });
@@ -20990,7 +21003,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi120106 !== true) return;
+    if (!d || d.xvaiLoi120301 !== true) return;
     const o = String(ev.origin || "");
     if (!(o.indexOf("https://flow.google.com") === 0 || o.indexOf("https://labs.google") === 0)) return;
     const tra = (kq) => {