feedback5: merge W5M — the nine 0.1.4 PRs (#150 #66 #146 #74 #72 #103 #149 #109 #160) and W4A (高台 per the trait, 阿戈尔 revive slots, 联防 devour) ported into the split layout
Conflicts: server/match/bot.js (W4A's comment + W5K's player data view pgd), test/golden/diy.json (regenerated). data/ equals an offline build of the merged tools/build-data.mjs. Golden regenerated on the merged code: against feedback5 the moved roster / bonds / fields / matches / standins scenarios are exactly W5M's per-PR attribution (#160 skill events, #109 deploy-timed lifecycle, #66 灵巧 sources and hidden layers, 83fc408 歌蕾蒂娅 placement), plus coop2-NORMAL-70-diy (fields operators those PRs touch) and diy-051 / diy-052 (events.skill only: Misery's deploy passives, #160); against fb5-merge4 only feedback5's own additions (the diy kits, coop2-NORMAL-70-diy).
This commit is contained in:
commit
9ce5435373
74 files changed
+2966
-1338
No files matched your search
@@ -220,12 +220,22 @@
|
||||
.readybtn.is-busy { opacity: .7; }
|
||||
|
||||
/* ---- bond strip ---------------------------------------------------------------------------------------- */
|
||||
.gm__bonds { position: absolute; left: 1.56rem; top: 1.36rem; right: 5.2rem; pointer-events: none; }
|
||||
.gm__bonds { position: absolute; left: 1.56rem; top: 1.36rem; right: 5.2rem; pointer-events: none;
|
||||
display: flex; align-items: flex-start; gap: max(.1rem, 8px); }
|
||||
/* Only the bond discs (and the +N chip) take the pointer: the strip's box spans the width under the top bar, where the
|
||||
top board row's units stand (row 12 at 16:9 / 21:9 / 720p / phones, the boss field's row 5 in a boss prep) — it used
|
||||
to swallow the taps and drags on them (review of user playtest #2 item 8: every own unit reachable). */
|
||||
.gm__bonds > *, .gm__bonds .bstrip { pointer-events: none; }
|
||||
.gm__bonds .bslot, .gm__bonds .bstrip__more { pointer-events: auto; }
|
||||
.gm__bond-list { min-width: 0; }
|
||||
/* The hidden list leaves no hit area over the board; only this compact tab can reopen it (GitHub #142). */
|
||||
.gm__bonds .bonds-toggle { pointer-events: auto; flex: none; display: inline-flex; align-items: center; justify-content: center;
|
||||
gap: max(.03rem, 2px); min-width: 44px; min-height: 44px; padding: .06rem .08rem;
|
||||
color: var(--text-hi); background: var(--bg-1); border: 1px solid var(--line-2); cursor: pointer;
|
||||
font-size: max(.14rem, 11px); line-height: 1; }
|
||||
.bonds-toggle .icon { width: max(.18rem, 14px); height: max(.18rem, 14px); }
|
||||
.bonds-toggle:hover { color: var(--mint-500); border-color: var(--mint-500); }
|
||||
.bonds-toggle:focus-visible { outline: 2px solid var(--mint-500); outline-offset: 2px; }
|
||||
.bstrip { display: flex; align-items: flex-start; gap: .1rem; flex-wrap: nowrap; }
|
||||
.bstrip.is-frozen .bslot { opacity: .5; filter: saturate(.4); }
|
||||
.bstrip--empty { display: inline-flex; align-items: center; gap: .12rem; padding: .08rem .16rem; font-size: .15rem; color: var(--text-dim); background: rgba(8, 11, 10, .6); border: 1px dashed var(--line-2); }
|
||||
|
||||
Reference in new issue
Block a user