feat: 中文界面、键盘控制、车手名单、名次脚本与 OBS 输出
- 键盘控制:数字按名次选车、方向键移动光标、出/收字幕、圈数 +/-、计时器、 名次脚本、快捷键总表;在输入框里打字时不触发,每次按键都有 Toast 反馈 - 车手名单编辑器(E):姓名/缩写/车号/国籍/车队/性能/黄T摄/头像均可改, 支持调整发车顺位、单条重置、全部重置、JSON 导入导出,localStorage 持久化 - LAP 可手动 +/-,LAP 旁新增 mm:ss.mmm 计时器(零点=计时榜出现的瞬间) - 名次脚本(J):JSON 预设,以计时器为零点,支持 swap/move/retire/restore/lap 与 order * 改脚本即时生效并从零重播,修掉"改完之后过期事件被一次性爆发"的问题 * order 立即铺回赛道;写错会在状态条里报出具体原因,不再静默失败 * localStorage 持久化,刷新不再丢失 - 合并 feature/standalone-output:OBS 透明输出页 /output 与 WebSocket 中继 server/relayServer.js * 修复中继晚连接的输出页只能收到最后一片补丁(缓存改为合并累加) - 修复 react-spring 缺少 deps 导致进场动画被每次渲染重启 (chyron、百叶窗、wipe、计时塔名次描边) - 界面中文化(上屏的转播图形保持英文),F1 字体栈补 CJK 回退 - 新增「启动开发服务器.cmd」一键启动,.gitignore 排除本地工具目录
This commit is contained in:
1 parent
ed5c6e752c
commit
9528307820
78 files changed
+5066
-438
No files matched your search
@@ -3,122 +3,104 @@ import { useEffect, useState } from "react";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import { Stack } from "@bedrock-layout/stack";
|
||||
import { Inline } from "@bedrock-layout/inline";
|
||||
import { FaCheck, FaStepForward, FaTimes } from "react-icons/fa";
|
||||
import { FaCheck, FaCode, FaKeyboard, FaStepForward, FaTimes, FaUserEdit } from "react-icons/fa";
|
||||
|
||||
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
|
||||
import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector";
|
||||
import { eventSelector } from "../../../../features/event/eventSelector";
|
||||
import { uiSelector } from "../../../../features/ui/uiSelector";
|
||||
import {
|
||||
incrementChyronsOpenState,
|
||||
setChyrons,
|
||||
setChyronsOpenState,
|
||||
} from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
|
||||
toggleDriverEditor,
|
||||
togglePositionScript,
|
||||
toggleShortcutHelp,
|
||||
} from "../../../../features/ui/uiSlice";
|
||||
import { updateChyronSettings } from "../../../../features/broadcast/director/broadcastDirectorSlice";
|
||||
import { useChyronDirector } from "../../../../features/broadcast/director/useChyronDirector";
|
||||
import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics";
|
||||
import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, FlagMode, GridSpot } from "../../../../types/state";
|
||||
import { BGChyronMode, BGChyronSubMode, FlagMode } from "../../../../types/state";
|
||||
import {
|
||||
chyronModeLabels,
|
||||
chyronSubModeLabels,
|
||||
flagModeLabels,
|
||||
labelOf,
|
||||
} from "../../../../i18n/labels";
|
||||
|
||||
import { SlotSelector } from "../../../Common/Inputs/SlotSelector";
|
||||
import { Button, CloseButton, OpenButton, Title } from "./styles";
|
||||
import { Toggle } from "../../../Common/Inputs/Toggle";
|
||||
import {
|
||||
Button,
|
||||
CloseButton,
|
||||
OpenButton,
|
||||
PanelButton,
|
||||
ShortcutBar,
|
||||
ShortcutItem,
|
||||
ShortcutKey,
|
||||
Title,
|
||||
} from "./styles";
|
||||
|
||||
/**
|
||||
* The chyron director's panel.
|
||||
*
|
||||
* Everything it sets lives in the store rather than in local state, so the
|
||||
* keyboard layer can drive the exact same settings and the panel always shows
|
||||
* what the next chyron will look like.
|
||||
*/
|
||||
export function ChyronsDirectorControls() {
|
||||
// Use state to prevent unnecessary resetting on re-renders.
|
||||
const [chyronModes] = useState<Array<BGChyronMode>>(getChyronModesList());
|
||||
const [chyronSubModes, setChyronSubModes] = useState<Array<BGChyronSubMode>>([]);
|
||||
|
||||
// Interface states.
|
||||
const [chyronMode, setChyronMode] = useState<BGChyronMode>("driver");
|
||||
const [chyronSubMode, setChyronSubMode] = useState<BGChyronSubMode>("medium");
|
||||
const [posFlag, setPosFlag] = useState(true);
|
||||
const [driverNum, setDriverNum] = useState(true);
|
||||
const [portrait, setPortrait] = useState(false);
|
||||
const [flagMode, setFlagMode] = useState<FlagMode>("country");
|
||||
|
||||
// Central state.
|
||||
const dispatch = useDispatch();
|
||||
const { chyrons } = useSelector(broadcastGraphicsSelector);
|
||||
const { selectedCars } = useSelector(broadcastDirectorSelector);
|
||||
const { grid } = useSelector(eventSelector);
|
||||
const { chyronSettings } = useSelector(broadcastDirectorSelector);
|
||||
const { driverEditorOpen, shortcutHelpOpen, positionScriptOpen } = useSelector(uiSelector);
|
||||
const chyron = useChyronDirector();
|
||||
|
||||
const {
|
||||
mode: chyronMode,
|
||||
subMode: chyronSubMode,
|
||||
flagMode,
|
||||
showPosFlag,
|
||||
showDriverNumber,
|
||||
showPortrait,
|
||||
} = chyronSettings;
|
||||
|
||||
// Handle changes to the chyron mode so submodes can be changed accordingly.
|
||||
useEffect(() => {
|
||||
setChyronSubModes(getChyronSubModesList(chyronMode));
|
||||
}, [chyronMode]);
|
||||
|
||||
const onOpen = () => {
|
||||
buildDriver();
|
||||
setTimeout(() => {
|
||||
// Delay a short time and increment the open state so the animation can happen.
|
||||
dispatch(incrementChyronsOpenState());
|
||||
}, 50);
|
||||
};
|
||||
|
||||
const onNext = () => {
|
||||
dispatch(incrementChyronsOpenState());
|
||||
};
|
||||
|
||||
const onClose = () => {
|
||||
dispatch(setChyronsOpenState(-1));
|
||||
};
|
||||
|
||||
const buildDriver = () => {
|
||||
if (selectedCars.length === 0) return;
|
||||
let primaryCarGridSpot = selectedCars[0];
|
||||
let secondaryCarGridSpot = selectedCars[1] ?? -1;
|
||||
|
||||
// Auto-sort drivers by position so trailing car appears second on mounting.
|
||||
if (chyronSubMode === "medium" && secondaryCarGridSpot != -1
|
||||
&& grid[secondaryCarGridSpot].position < grid[primaryCarGridSpot].position) {
|
||||
secondaryCarGridSpot = selectedCars[0];
|
||||
primaryCarGridSpot = selectedCars[1];
|
||||
}
|
||||
|
||||
const newChyrons: BGChyrons = {
|
||||
openState: 0,
|
||||
mode: chyronMode,
|
||||
subMode: chyronSubMode,
|
||||
driver: {
|
||||
primary: buildDriverChyron(primaryCarGridSpot),
|
||||
secondary: secondaryCarGridSpot !== -1
|
||||
? buildDriverChyron(secondaryCarGridSpot) : null,
|
||||
},
|
||||
};
|
||||
dispatch(setChyrons(newChyrons));
|
||||
};
|
||||
|
||||
const buildDriverChyron = (carGridSpot: GridSpot): BGChyronDriver => ({
|
||||
carGridSpot,
|
||||
flagMode,
|
||||
showPosFlag: posFlag,
|
||||
showDriverNumber: driverNum,
|
||||
showPortrait: chyronSubMode === "large" ? false : portrait,
|
||||
});
|
||||
const modeIndex = Math.max(0, chyronModes.indexOf(chyronMode));
|
||||
const subModeIndex = Math.max(0, chyronSubModes.indexOf(chyronSubMode));
|
||||
const flagModeIndex = Math.max(0, flagModeList.indexOf(flagMode));
|
||||
|
||||
const modeControls = (mode: BGChyronMode, subMode: BGChyronSubMode) => {
|
||||
if (mode === "driver") {
|
||||
return (
|
||||
<InlineCluster gutter="md">
|
||||
<Toggle
|
||||
label="Pos. Flag"
|
||||
toggled={posFlag}
|
||||
onToggle={setPosFlag}
|
||||
label="名次牌"
|
||||
toggled={showPosFlag}
|
||||
onToggle={value => dispatch(updateChyronSettings({ showPosFlag: value }))}
|
||||
/>
|
||||
<Toggle
|
||||
label="Driver Num."
|
||||
toggled={driverNum}
|
||||
onToggle={setDriverNum}
|
||||
label="车号"
|
||||
toggled={showDriverNumber}
|
||||
onToggle={value => dispatch(updateChyronSettings({ showDriverNumber: value }))}
|
||||
/>
|
||||
{subMode === "medium" && (
|
||||
<Toggle
|
||||
label="Portrait"
|
||||
toggled={portrait}
|
||||
onToggle={setPortrait}
|
||||
label="头像"
|
||||
toggled={showPortrait}
|
||||
onToggle={value => dispatch(updateChyronSettings({ showPortrait: value }))}
|
||||
/>
|
||||
)}
|
||||
<SlotSelector
|
||||
label="Flag Mode"
|
||||
label="旗帜模式"
|
||||
items={flagModeList}
|
||||
onChange={index => setFlagMode(flagModeList[index])}
|
||||
slotWidth="12ch"
|
||||
value={flagModeIndex}
|
||||
formatter={value => labelOf(flagModeLabels, value as FlagMode)}
|
||||
onChange={index => dispatch(updateChyronSettings({
|
||||
flagMode: flagModeList[index] as FlagMode,
|
||||
}))}
|
||||
slotWidth="8ch"
|
||||
/>
|
||||
</InlineCluster>
|
||||
);
|
||||
@@ -130,39 +112,87 @@ export function ChyronsDirectorControls() {
|
||||
return (
|
||||
<Stack gutter="md">
|
||||
<Inline gutter="md" stretch={1}>
|
||||
<Title>Chyrons</Title>
|
||||
<Title>车名字幕</Title>
|
||||
<Inline gutter="md" stretch="all">
|
||||
<SlotSelector
|
||||
items={chyronModes}
|
||||
onChange={index => setChyronMode(chyronModes[index])}
|
||||
value={modeIndex}
|
||||
formatter={value => labelOf(chyronModeLabels, value)}
|
||||
onChange={index => dispatch(updateChyronSettings({
|
||||
mode: chyronModes[index],
|
||||
}))}
|
||||
/>
|
||||
<SlotSelector
|
||||
items={chyronSubModes}
|
||||
onChange={index => setChyronSubMode(chyronSubModes[index])}
|
||||
value={subModeIndex}
|
||||
formatter={value => labelOf(chyronSubModeLabels, value)}
|
||||
onChange={index => dispatch(updateChyronSettings({
|
||||
subMode: chyronSubModes[index],
|
||||
}))}
|
||||
/>
|
||||
</Inline>
|
||||
<Inline gutter="sm">
|
||||
<OpenButton
|
||||
onClick={onOpen}
|
||||
disabled={chyrons != null}
|
||||
onClick={() => chyron.open()}
|
||||
disabled={!chyron.canOpen}
|
||||
title="显示字幕(Enter)"
|
||||
>
|
||||
<FaCheck size="0.8em" />
|
||||
</OpenButton>
|
||||
<Button
|
||||
onClick={onNext}
|
||||
disabled={chyrons == null || chyrons.openState === -1}
|
||||
onClick={chyron.next}
|
||||
disabled={!chyron.canNext}
|
||||
title="播放下一步动画(Shift+Enter)"
|
||||
>
|
||||
<FaStepForward size="0.8em" />
|
||||
</Button>
|
||||
<CloseButton
|
||||
onClick={onClose}
|
||||
disabled={chyrons == null || chyrons.openState <= 0}
|
||||
onClick={chyron.close}
|
||||
disabled={!chyron.canClose}
|
||||
title="收起字幕(Backspace)"
|
||||
>
|
||||
<FaTimes size="0.8em" />
|
||||
</CloseButton>
|
||||
<PanelButton
|
||||
onClick={() => dispatch(toggleDriverEditor())}
|
||||
disabled={false}
|
||||
title="车手名单编辑器(E)"
|
||||
style={driverEditorOpen ? { backgroundColor: "#f4ae40" } : undefined}
|
||||
>
|
||||
<FaUserEdit size="0.8em" />
|
||||
</PanelButton>
|
||||
<PanelButton
|
||||
onClick={() => dispatch(togglePositionScript())}
|
||||
disabled={false}
|
||||
title="JSON 名次脚本(J)"
|
||||
style={positionScriptOpen ? { backgroundColor: "#f4ae40" } : undefined}
|
||||
>
|
||||
<FaCode size="0.8em" />
|
||||
</PanelButton>
|
||||
<PanelButton
|
||||
onClick={() => dispatch(toggleShortcutHelp())}
|
||||
disabled={false}
|
||||
title="全部快捷键(?)"
|
||||
style={shortcutHelpOpen ? { backgroundColor: "#f4ae40" } : undefined}
|
||||
>
|
||||
<FaKeyboard size="0.8em" />
|
||||
</PanelButton>
|
||||
</Inline>
|
||||
</Inline>
|
||||
{modeControls(chyronMode, chyronSubMode)}
|
||||
<ShortcutBar>
|
||||
<ShortcutItem><ShortcutKey>1…0</ShortcutKey>按名次选车</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>↑↓</ShortcutKey>移动光标</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>空格</ShortcutKey>加第二名车手</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>回车</ShortcutKey>出字幕</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>Esc</ShortcutKey>收起</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>S</ShortcutKey>开始 / 停止</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>+ / -</ShortcutKey>圈数</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>C</ShortcutKey>计时器</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>E</ShortcutKey>车手名单</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>J</ShortcutKey>名次脚本</ShortcutItem>
|
||||
<ShortcutItem><ShortcutKey>?</ShortcutKey>全部快捷键</ShortcutItem>
|
||||
</ShortcutBar>
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
@@ -35,3 +35,33 @@ export const CloseButton = styled(Button)<ButtonProps>`
|
||||
background-color: ${({ disabled }) => disabled
|
||||
? p => p.theme.colors.disabledRed : p => p.theme.colors.activeRed};
|
||||
`;
|
||||
|
||||
export const PanelButton = styled(Button)<ButtonProps>`
|
||||
background-color: white;
|
||||
font-size: 0.9em;
|
||||
`;
|
||||
|
||||
export const ShortcutBar = styled.div`
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: baseline;
|
||||
gap: 0.3em 1.4em;
|
||||
margin-top: 0.5em;
|
||||
font-family: ${p => p.theme.fonts.f1Regular};
|
||||
font-size: 0.74em;
|
||||
color: ${p => p.theme.colors.darkGrey};
|
||||
`;
|
||||
|
||||
export const ShortcutItem = styled.span`
|
||||
white-space: nowrap;
|
||||
`;
|
||||
|
||||
export const ShortcutKey = styled.span`
|
||||
font-family: ${p => p.theme.fonts.f1Bold};
|
||||
color: ${p => p.theme.colors.darkGrey};
|
||||
background-color: ${p => p.theme.colors.faintGrey};
|
||||
border: 1px solid ${p => p.theme.colors.lightGrey};
|
||||
border-radius: 0.2em;
|
||||
padding: 0 0.35em;
|
||||
margin-right: 0.35em;
|
||||
`;
|
||||
Reference in new issue
Block a user