feedback7: merge fb7-ui-backlog — #229 device tooltips, #238 settings button in lobby / room, #138 准备 folds the shop, #120 in-match spectator roster (cap stays 2), PR #308 capsule counts (+ the shared-field progress fix), PR #333 empty new shop slot on 调度中心 upgrade
- Conflicts: the stats entry (merged fb7-stats) and the settings button both sit in the lobby / room top bars — both kept;
public/js/ui/settings.js (#321 diagnostics, voiceLang, SettingsButton); docs/PLAYING.md table rows resolved line by
line against the merge base (#368, #354, #333 edits kept); docs/SIM.md / design/network.md snapshot field lists
(resolved + ammo / wolves / neg / stand / standCut); design/client.md Screens line (#368's AI switch kept).
- Grok review: MERGE AFTER FIXES — the shared-field capsule finding fixed on the branch (1a880699).
- Golden: roster 23, bonds 2, fields 11, matches 18, diy 11 — #308 totals / snapshots and #333's shop RNG (union OK);
broad node --test 5473 (5472 pass, 0 fail, 1 skipped); lint 0 errors; typecheck; i18n strict clean.
This commit is contained in:
commit
dc609ea13f
71 files changed
+3016
-806
No files matched your search
@@ -136,11 +136,17 @@ export class BattleDeploy {
|
||||
this._unblock(unit);
|
||||
this._enemiesDirty = true;
|
||||
if (reason === 'killed') {
|
||||
const pp = this._pp(unit.ownerId);
|
||||
if (unit.counted) {
|
||||
this.killed++;
|
||||
const pp = this._pp(unit.ownerId);
|
||||
if (pp) pp.killed++;
|
||||
}
|
||||
// the HUD capsule's numerator (DESIGN §14): only the enemies the stage itself scheduled (`inTotal`) — a split
|
||||
// child / summon / part knocked down here is no 已解决 of the stage's own list and moves the capsule not at all
|
||||
if (unit.inTotal) {
|
||||
this.killedInTotal++;
|
||||
if (pp) pp.killedInTotal++;
|
||||
}
|
||||
if (killer) killer.stats.kills++;
|
||||
if (unit.bounty && unit.bounty.coins > 0) this.addCoins(this._bountyPayee(unit, killer), unit.bounty.coins);
|
||||
}
|
||||
@@ -253,5 +259,12 @@ export class BattleDeploy {
|
||||
if (e.counted || e.isBoss) pp.perfect = false;
|
||||
}
|
||||
if (e.counted) this.leakedCount++;
|
||||
// the HUD capsule's leak counter (DESIGN §14): only the stage's own enemies (`inTotal`) — a leaked split child or
|
||||
// summon still costs LP through `counted`/`leakedCount` and still breaks 完美作战, but it is no 漏掉 of the stage's
|
||||
// own list, so the capsule's numerator does not move for it
|
||||
if (e.inTotal) {
|
||||
this.leakedInTotal++;
|
||||
if (pp) pp.leakedInTotal++;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user