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
@@ -684,6 +684,7 @@
|
||||
" · 未装备模组": " · 未裝備模組",
|
||||
"已购买": "已購買",
|
||||
"已招募": "已招募",
|
||||
"空栏位:刷新或下回合开始时补满": "空欄位:更新或下回合開始時補滿",
|
||||
"再次点击确认升级({price} 资金)": "再次點擊確認升級({price} 資金)",
|
||||
"升级调度中心({price} 资金) · {key}": "升級調度中心({price} 資金) · {key}",
|
||||
"已满级": "已滿級",
|
||||
@@ -780,6 +781,7 @@
|
||||
"观战席": "觀戰席",
|
||||
"移出观战者 {name}": "移出觀戰者 {name}",
|
||||
"移出该观战者": "移出該觀戰者",
|
||||
"观战者不占博士席位,只能观看;创建者可以把观战者移出,被移出的人不再收到战场画面。": "觀戰者不佔博士席位,只能觀看;建立者可以把觀戰者移出,被移出的人不再收到戰場畫面。",
|
||||
"入座": "入座",
|
||||
"移出同盟": "移出同盟",
|
||||
"确定将「{name}」移出同盟吗?对方可以凭同盟密钥重新加入。": "確定將「{name}」移出同盟嗎?對方可以憑同盟金鑰重新加入。",
|
||||
@@ -915,6 +917,22 @@
|
||||
"地面单位可通过": "地面單位可通過",
|
||||
"地形机制": "地形機制",
|
||||
"这一格": "這一格",
|
||||
"场地装置": "場地裝置",
|
||||
"装置机制": "裝置機制",
|
||||
"挡在地面上的工事:地面敌人会绕开它走;只有无路可走时才会撞上来,把它摧毁后继续前进": "擋在地面上的工事:地面敵人會繞開它走;只有無路可走時才會撞上來,把它摧毀後繼續前進",
|
||||
"生命 {hp} 点,被摧毁后从场上消失": "生命 {hp} 點,被摧毀後從場上消失",
|
||||
"自动攻击射程内的一名敌人,造成法术伤害,命中的敌人附加脆弱": "自動攻擊射程內的一名敵人,造成法術傷害,命中的敵人附加脆弱",
|
||||
"按当前层数最高的盟约计算:每 1 层,攻击速度 +{aspd}(至多 +{aspdMax}),附加的脆弱 +{frag}%(至多 +{fragMax}%)": "按目前層數最高的盟約計算:每 1 層,攻擊速度 +{aspd}(最多 +{aspdMax}),附加的脆弱 +{frag}%(最多 +{fragMax}%)",
|
||||
"脆弱持续 {sec} 秒": "脆弱持續 {sec} 秒",
|
||||
"高台位装置:地面敌人不能走上这一格": "高台位裝置:地面敵人不能走上這一格",
|
||||
"远程位干员可以部署在其上;站上去的干员在高位,不阻挡敌人": "遠程位幹員可以部署在其上;站上去的幹員在高位,不阻擋敵人",
|
||||
"向前方 {n} 格吹出气流(这一台朝{dir})": "向前方 {n} 格吹出氣流(這一台朝{dir})",
|
||||
"朝向与风向相同的攻击力 {v}": "朝向與風向相同的攻擊力 {v}",
|
||||
"相反的 {v}": "相反的 {v}",
|
||||
"部署在气流里的干员:{mods}": "部署在氣流裡的幹員:{mods}",
|
||||
"顺风移动速度 ×{v}": "順風移動速度 ×{v}",
|
||||
"逆风 ×{v}": "逆風 ×{v}",
|
||||
"在气流里移动的敌人:{mods}": "在氣流裡移動的敵人:{mods}",
|
||||
"全部清空": "全部清空",
|
||||
"清空全部 {n} 个自选名额?": "清空全部 {n} 個自選名額?",
|
||||
"文件过大,请选择「导出」下载的自选编队文件": "檔案過大,請選擇「匯出」下載的自選編隊檔案",
|
||||
|
||||
Reference in new issue
Block a user