diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..ee3740f
Binary files /dev/null and b/favicon.ico differ
diff --git a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx
index b10247d..d630b64 100644
--- a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx
+++ b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx
@@ -22,7 +22,7 @@ export function ChyronContainer({ debug = false, placement = {} }: ChyronContain
chyronData={chyrons.driver.primary}
subMode={chyrons.subMode}
openState={chyrons.openState}
- showRolex
+ showRolex={false}
debugDurationMultiplier={debug ? debugDurationMultiplier : 1}
/>
);
diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
index 7f1309c..b67aa7a 100644
--- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
+++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
@@ -62,7 +62,9 @@ export function ChyronDriver({
const dispatch = useDispatch();
const { design: { chyronDriver: cdTheme } } = theme;
- const teamColor = theme.colors.teams[car.driver.team.id];
+
+ // 【修改点在这里】:使用 as any 绕过严格类型检查,并加上了默认白色 #ffffff 兜底
+ const teamColor = (theme.colors.teams as any)[car.driver.team.id] || "#ffffff";
// `deps` = "only update this spring when these change". Without it
// react-spring re-runs ctrl.start() after every render, so an unrelated store
@@ -262,4 +264,4 @@ export function ChyronDriver({
)}
);
-}
+}
\ No newline at end of file
diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx
index e499e3b..d0b33e3 100644
--- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx
+++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx
@@ -291,9 +291,7 @@ export function TimingTowerRow({
-
-
-
+
@@ -71,4 +73,4 @@ export function VenetianBlindsWorkspace() {
)}
);
-}
+}
\ No newline at end of file
diff --git a/src/domain/data/teams.ts b/src/domain/data/teams.ts
index 2f15bf0..d6319a4 100644
--- a/src/domain/data/teams.ts
+++ b/src/domain/data/teams.ts
@@ -4,345 +4,57 @@ import { Percent } from "../../types/style";
import { repeater } from "../../utils/strings";
/**
- * Do not grab directly!
- * 2021 Driver lineup with 2022 newcomers included (Zhou and Albon).
+ * 班级车队字典
*/
export const teams: {[id: string]: Team} = {
- alfaRomeo: {
- id: "alfaRomeo",
- shortName: "Alfa Romeo",
- fullName: "Alfa Romeo F1 Team ORLEN",
- nationality: "CHE",
- performance: 1.007,
- },
- alphaTauri: {
- id: "alphaTauri",
- shortName: "AlphaTauri",
- fullName: "Scuderia AlphaTauri",
- nationality: "ITA",
- performance: 1.016,
- },
- alpine: {
- id: "alpine",
- shortName: "Alpine",
- fullName: "Alpine F1 Team",
- nationality: "FRA",
- performance: 1.014,
- },
- astonMartin: {
- id: "astonMartin",
- shortName: "Aston Martin",
- fullName: "Aston Martin Cognizant Formula One Team",
- nationality: "GBR",
- performance: 1.012,
- },
- ferrari: {
- id: "ferrari",
- shortName: "Ferrari",
- fullName: "Scuderia Ferrari",
- nationality: "ITA",
- performance: 1.021,
- },
- haas: {
- id: "haas",
- shortName: "Haas F1 Team",
- fullName: "Uralkali Haas F1 Team",
- nationality: "USA",
- performance: 1.000,
- },
- mclaren: {
- id: "mclaren",
- shortName: "McLaren",
- fullName: "McLaren F1 Team",
- nationality: "GBR",
- performance: 1.020,
- },
- mercedes: {
- id: "mercedes",
- shortName: "Mercedes",
- fullName: "Mercedes-AMG Petronas Formula One Team",
- nationality: "DEU",
- performance: 1.025,
- },
- redBull: {
- id: "redBull",
- shortName: "Red Bull Racing",
- fullName: "Red Bull Racing",
- nationality: "AUT",
- performance: 1.024,
- },
- williams: {
- id: "williams",
- shortName: "Williams",
- fullName: "Williams Racing",
- nationality: "GBR",
- performance: 1.008,
- },
+ class2501: { id: "class2501", shortName: "2501班", fullName: "2501班", nationality: "CHN", performance: 1.000 },
+ class2503: { id: "class2503", shortName: "2503班", fullName: "2503班", nationality: "CHN", performance: 1.000 },
+ class2504: { id: "class2504", shortName: "2504班", fullName: "2504班", nationality: "CHN", performance: 1.000 },
+ class2505: { id: "class2505", shortName: "2505班", fullName: "2505班", nationality: "CHN", performance: 1.000 },
+ class2506: { id: "class2506", shortName: "2506班", fullName: "2506班", nationality: "CHN", performance: 1.000 },
+ class2507: { id: "class2507", shortName: "2507班", fullName: "2507班", nationality: "CHN", performance: 1.000 },
+ class2508: { id: "class2508", shortName: "2508班", fullName: "2508班", nationality: "CHN", performance: 1.000 },
+ class2509: { id: "class2509", shortName: "2509班", fullName: "2509班", nationality: "CHN", performance: 1.000 },
+ class2510: { id: "class2510", shortName: "2510班", fullName: "2510班", nationality: "CHN", performance: 1.000 },
+ class2511: { id: "class2511", shortName: "2511班", fullName: "2511班", nationality: "CHN", performance: 1.000 },
+ class2512: { id: "class2512", shortName: "2512班", fullName: "2512班", nationality: "CHN", performance: 1.000 },
+ class2515: { id: "class2515", shortName: "2515班", fullName: "2515班", nationality: "CHN", performance: 1.000 },
+ class2516: { id: "class2516", shortName: "2516班", fullName: "2516班", nationality: "CHN", performance: 1.000 },
+ class2520: { id: "class2520", shortName: "2520班", fullName: "2520班", nationality: "CHN", performance: 1.000 },
+ class2522: { id: "class2522", shortName: "2522班", fullName: "2522班", nationality: "CHN", performance: 1.000 },
+ class2523: { id: "class2523", shortName: "2523班", fullName: "2523班", nationality: "CHN", performance: 1.000 },
+ class2524: { id: "class2524", shortName: "2524班", fullName: "2524班", nationality: "CHN", performance: 1.000 },
+ class2525: { id: "class2525", shortName: "2525班", fullName: "2525班", nationality: "CHN", performance: 1.000 },
+ class2528: { id: "class2528", shortName: "2528班", fullName: "2528班", nationality: "CHN", performance: 1.000 },
+ class0000: { id: "class0000", shortName: "未知班级", fullName: "未知班级", nationality: "CHN", performance: 1.000 },
};
-/** Every team id, in the order the teams table declares them. */
+/** 所有车队 ID */
export const teamIds: TeamId[] = Object.keys(teams) as TeamId[];
/**
- * Do not grab directly!
- * 2021 Driver lineup with 2022 newcomers included (Zhou and Albon)
+ * 参赛车手字典(键名已修改为 runner1 ~ runner20,与 eventSlice 保持一致)
*/
-export const drivers: {[lastName: string]: Driver} = {
- albon: {
- id: "albon",
- firstName: "Alex",
- lastName: "Albon",
- number: 23,
- team: teams.williams,
- yellowTCam: false, // TBD
- initials: "ALB",
- nationality: "THA",
- performance: 1.000,
- },
- alonso: {
- id: "alonso",
- firstName: "Fernando",
- lastName: "Alonso",
- number: 14,
- team: teams.alpine,
- yellowTCam: false,
- initials: "ALO",
- nationality: "ESP",
- performance: 1.003,
- },
- bottas: {
- id: "bottas",
- firstName: "Valtteri",
- lastName: "Bottas",
- number: 77,
- team: teams.mercedes,
- yellowTCam: true,
- initials: "BOT",
- nationality: "FIN",
- performance: 1.000,
- },
- gasly: {
- id: "gasly",
- firstName: "Pierre",
- lastName: "Gasly",
- number: 10,
- team: teams.alphaTauri,
- yellowTCam: true,
- initials: "GAS",
- nationality: "FRA",
- performance: 1.020,
- },
- giovinazzi: {
- id: "giovinazzi",
- firstName: "Antonio",
- lastName: "Giovinazzi",
- number: 99,
- team: teams.alfaRomeo,
- yellowTCam: true,
- initials: "GIO",
- nationality: "ITA",
- performance: 1.000,
- },
- hamilton: {
- id: "hamilton",
- firstName: "Lewis",
- lastName: "Hamilton",
- number: 44,
- team: teams.mercedes,
- yellowTCam: false,
- initials: "HAM",
- nationality: "GBR",
- performance: 1.010,
- },
- kubica: {
- id: "kubica",
- firstName: "Robert",
- lastName: "Kubica",
- number: 88,
- team: teams.alfaRomeo,
- yellowTCam: false,
- initials: "KUB",
- nationality: "POL",
- performance: 0.980,
- },
- latifi: {
- id: "latifi",
- firstName: "Nicolas",
- lastName: "Latifi",
- number: 6,
- team: teams.williams,
- yellowTCam: true,
- initials: "LAT",
- nationality: "CAN",
- performance: 1.000,
- },
- leclerc: {
- id: "leclerc",
- firstName: "Charles",
- lastName: "Leclerc",
- number: 16,
- team: teams.ferrari,
- yellowTCam: false,
- initials: "LEC",
- nationality: "MCO",
- performance: 1.005,
- },
- mazepin: {
- id: "mazepin",
- firstName: "Nikita",
- lastName: "Mazepin",
- number: 9,
- team: teams.haas,
- yellowTCam: false,
- initials: "MAZ",
- nationality: "RAF",
- performance: 1.000,
- },
- norris: {
- id: "norris",
- firstName: "Lando",
- lastName: "Norris",
- number: 4,
- team: teams.mclaren,
- yellowTCam: true,
- initials: "NOR",
- nationality: "GBR",
- performance: 1.009,
- },
- ocon: {
- id: "ocon",
- firstName: "Esteban",
- lastName: "Ocon",
- number: 31,
- team: teams.alpine,
- yellowTCam: true,
- initials: "OCO",
- nationality: "FRA",
- performance: 1.000,
- },
- perez: {
- id: "perez",
- firstName: "Sergio",
- // lastName: "Pérez",
- lastName: "Perez",
- number: 11,
- team: teams.redBull,
- yellowTCam: true,
- initials: "PER",
- nationality: "MEX",
- performance: 1.000,
- },
- raikkonen: {
- id: "raikkonen",
- firstName: "Kimi",
- // lastName: "Räikkönen",
- lastName: "Raikkonen",
- number: 7,
- team: teams.alfaRomeo,
- yellowTCam: false,
- initials: "RAI",
- nationality: "FIN",
- performance: 1.002,
- },
- ricciardo: {
- id: "ricciardo",
- firstName: "Daniel",
- lastName: "Ricciardo",
- number: 3,
- team: teams.mclaren,
- yellowTCam: false,
- initials: "RIC",
- nationality: "AUS",
- performance: 1.000,
- },
- russell: {
- id: "russell",
- firstName: "George",
- lastName: "Russell",
- number: 63,
- team: teams.williams,
- yellowTCam: false,
- initials: "RUS",
- nationality: "GBR",
- performance: 1.016,
- },
- sainz: {
- id: "sainz",
- firstName: "Carlos",
- lastName: "Sainz",
- number: 55,
- team: teams.ferrari,
- yellowTCam: true,
- initials: "SAI",
- nationality: "ESP",
- performance: 1.000,
- },
- schumacher: {
- id: "schumacher",
- firstName: "Mick",
- lastName: "Schumacher",
- number: 47,
- team: teams.haas,
- yellowTCam: true,
- initials: "MSC",
- nationality: "DEU",
- performance: 1.025,
- },
- stroll: {
- id: "stroll",
- firstName: "Lance",
- lastName: "Stroll",
- number: 18,
- team: teams.astonMartin,
- yellowTCam: false,
- initials: "STR",
- nationality: "CAN",
- performance: 1.000,
- },
- tsunoda: {
- id: "tsunoda",
- firstName: "Yuki",
- lastName: "Tsunoda",
- number: 22,
- team: teams.alphaTauri,
- yellowTCam: false,
- initials: "TSU",
- nationality: "JPN",
- performance: 1.000,
- },
- verstappen: {
- id: "verstappen",
- firstName: "Max",
- lastName: "Verstappen",
- number: 33,
- team: teams.redBull,
- yellowTCam: false,
- initials: "VER",
- nationality: "NLD",
- performance: 1.020,
- },
- vettel: {
- id: "vettel",
- firstName: "Sebastian",
- lastName: "Vettel",
- number: 5,
- team: teams.astonMartin,
- yellowTCam: true,
- initials: "VET",
- nationality: "DEU",
- performance: 1.003,
- },
- zhou: {
- id: "zhou",
- firstName: "Guanyu",
- lastName: "Zhou",
- number: 24,
- team: teams.alfaRomeo,
- yellowTCam: true,
- initials: "ZHO",
- nationality: "CHN",
- performance: 1.000,
- },
+export const drivers: {[id: string]: Driver} = {
+ runner1: { id: "runner1", firstName: "Hanxi", lastName: "Li", number: 2501, team: teams.class2501, yellowTCam: false, initials: "LIH", nationality: "CHN", performance: 1.000 },
+ runner2: { id: "runner2", firstName: "Shengchuan", lastName: "Liao", number: 2523, team: teams.class2523, yellowTCam: false, initials: "LIA", nationality: "CHN", performance: 1.000 },
+ runner3: { id: "runner3", firstName: "Linxuan", lastName: "Pang", number: 2507, team: teams.class2507, yellowTCam: false, initials: "PAN", nationality: "CHN", performance: 1.000 },
+ runner4: { id: "runner4", firstName: "Junlin", lastName: "Qin", number: 2506, team: teams.class2506, yellowTCam: false, initials: "JQI", nationality: "CHN", performance: 1.000 },
+ runner5: { id: "runner5", firstName: "Jianming", lastName: "Deng", number: 2515, team: teams.class2515, yellowTCam: false, initials: "DEN", nationality: "CHN", performance: 1.000 },
+ runner6: { id: "runner6", firstName: "Yaomin", lastName: "Wei", number: 2504, team: teams.class2504, yellowTCam: false, initials: "YWE", nationality: "CHN", performance: 1.000 },
+ runner7: { id: "runner7", firstName: "Ziyi", lastName: "Xian", number: 2505, team: teams.class2505, yellowTCam: false, initials: "XIA", nationality: "CHN", performance: 1.000 },
+ runner8: { id: "runner8", firstName: "Zhenxing", lastName: "Yu", number: 2510, team: teams.class2510, yellowTCam: false, initials: "YUZ", nationality: "CHN", performance: 1.000 },
+ runner9: { id: "runner9", firstName: "Haochen", lastName: "Liu", number: 2516, team: teams.class2516, yellowTCam: false, initials: "LIU", nationality: "CHN", performance: 1.000 },
+ runner10: { id: "runner10", firstName: "Guitao", lastName: "Lu", number: 2524, team: teams.class2524, yellowTCam: false, initials: "LUG", nationality: "CHN", performance: 1.000 },
+ runner11: { id: "runner11", firstName: "Haocheng", lastName: "Wei", number: 2508, team: teams.class2508, yellowTCam: false, initials: "HWE", nationality: "CHN", performance: 1.000 },
+ runner12: { id: "runner12", firstName: "Zirui", lastName: "Liao", number: 2528, team: teams.class2528, yellowTCam: false, initials: "ZLI", nationality: "CHN", performance: 1.000 },
+ runner13: { id: "runner13", firstName: "Jianning", lastName: "Wei", number: 2503, team: teams.class2503, yellowTCam: false, initials: "JWE", nationality: "CHN", performance: 1.000 },
+ runner14: { id: "runner14", firstName: "Yuqi", lastName: "Li", number: 2512, team: teams.class2512, yellowTCam: false, initials: "YLI", nationality: "CHN", performance: 1.000 },
+ runner15: { id: "runner15", firstName: "Bohan", lastName: "Zhang", number: 2520, team: teams.class2520, yellowTCam: false, initials: "ZHA", nationality: "CHN", performance: 1.000 },
+ runner16: { id: "runner16", firstName: "Rongyuan", lastName: "Wang", number: 2522, team: teams.class2522, yellowTCam: false, initials: "WAN", nationality: "CHN", performance: 1.000 },
+ runner17: { id: "runner17", firstName: "Haohan", lastName: "Wei", number: 2511, team: teams.class2511, yellowTCam: false, initials: "WHA", nationality: "CHN", performance: 1.000 },
+ runner18: { id: "runner18", firstName: "Yuchen", lastName: "Zhu", number: 2525, team: teams.class2525, yellowTCam: false, initials: "ZHU", nationality: "CHN", performance: 1.000 },
+ runner19: { id: "runner19", firstName: "Shangshui", lastName: "Qin", number: 2509, team: teams.class2509, yellowTCam: false, initials: "SQI", nationality: "CHN", performance: 1.000 },
};
type NumberStyleRule = {
@@ -358,240 +70,58 @@ export type NumberStyle = {
fontFamily: string,
rules: Array,
};
-/**
- * Do not grab directly!
- */
-export const teamNumberStyles: { [teamId: string]: NumberStyle } = {
- alfaRomeo: {
- numberColor: "#ffe9f4",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #900000", 2) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#900000", width: 0.05 },
- { type: "shadow", property: "0 0 0.07em #900000" },
- ],
- },
- alphaTauri: {
- numberColor: "#eff5fc",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "stroke", color: "#2b4562", width: 0.03 },
- ],
- },
- alpine: {
- numberColor: "#ddffff",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #4B7B9E", 4) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "shadow", property: repeater("0 0 0.07em #65A6D6", 2) },
- ],
- },
- astonMartin: {
- numberColor: "#f9ffff",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #006f62", 4) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#006f62", width: 0.05 },
- { type: "shadow", property: "0 0 0.07em #006f62" },
- ],
- },
- haas: {
- numberColor: "#fff",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #fff", 4) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#999", width: 0.05 },
- { type: "shadow", property: "0 0 0.07em #eee" },
- ],
- },
- ferrari: {
- numberColor: "#fff5f6",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #dc0000", 2) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#dc0000", width: 0.05 },
- { type: "shadow", property: "0 0 0.07em #dc0000" },
- ],
- },
- mclaren: {
- numberColor: "#fdf5f6",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #ffb241", 2) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#ffb241", width: 0.05 },
- { type: "shadow", property: "0 0 0.07em #ffb241" },
- ],
- },
- mercedes: {
- numberColor: "#daffff",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #daffff", 4) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#35dfae", width: 0.05 },
- { type: "shadow", property: repeater("0 0 0.07em #35dfae", 2) },
- ],
- },
- redBull: {
- numberColor: "#f2f2ff",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #0600ef", 4) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#ebffff", width: 0 },
- ],
- },
- williams: {
- numberColor: "#ebffff",
- fontFamily: theme.fonts.f1Italic,
- rules: [
- { type: "shadow", property: repeater("0 0 0.2em #005aff", 2) },
- { type: "stroke", color: "#000", width: 0.13 },
- { type: "stroke", color: "#ebffff", width: 0 },
- ],
- },
+
+// 为所有班级配置一套通用的 F1 风格的数字样式
+const defaultNumberStyle: NumberStyle = {
+ numberColor: "#ffffff",
+ fontFamily: theme.fonts.f1Italic,
+ rules: [
+ { type: "shadow", property: repeater("0 0 0.2em #000", 2) },
+ { type: "stroke", color: "#000", width: 0.13 },
+ { type: "stroke", color: "#555", width: 0.05 },
+ { type: "shadow", property: "0 0 0.07em #333" },
+ ],
};
+export const teamNumberStyles: { [teamId: string]: NumberStyle } = teamIds.reduce((acc, id) => {
+ acc[id] = defaultNumberStyle;
+ return acc;
+}, {} as { [teamId: string]: NumberStyle });
export type TeamFlagStyle = {
backgroundColor: string,
imageSize: Percent,
- imagePos: {
- x: number,
- y: number,
- },
- subFlagModifier: {
- x: number,
- y: number,
- scale: number,
- },
+ imagePos: { x: number, y: number },
+ subFlagModifier: { x: number, y: number, scale: number },
};
-export const teamFlagStyles: { [teamId: string]: TeamFlagStyle } = {
- alfaRomeo: {
- backgroundColor: "#660000",
- imageSize: 41,
- imagePos: { x: .32, y: .08 },
- subFlagModifier: { x: .99, y: .97, scale: .99 },
- },
- alphaTauri: {
- backgroundColor: "#232c3b",
- imageSize: 58,
- imagePos: { x: .25, y: -.15 },
- subFlagModifier: { x: 1, y: .9, scale: .99 },
- },
- alpine: {
- backgroundColor: "black",
- imageSize: 51,
- imagePos: { x: .23, y: -.12 },
- subFlagModifier: { x: 1.02, y: .98, scale: .98 },
- },
- astonMartin: {
- backgroundColor: "#037356",
- imageSize: 109,
- imagePos: { x: .05, y: -.75 },
- subFlagModifier: { x: 1.05, y: .9, scale: .95 },
- },
- ferrari: {
- backgroundColor: "#dc0000",
- imageSize: 50,
- imagePos: { x: .3, y: .04 },
- subFlagModifier: { x: 1, y: 1, scale: .98 },
- },
- haas: {
- backgroundColor: "#f0f0f0",
- imageSize: 46,
- imagePos: { x: .3, y: -.04 },
- subFlagModifier: { x: 1, y: .98, scale: .98 },
- },
- mclaren: {
- backgroundColor: "#545459",
- imageSize: 50,
- imagePos: { x: .25, y: -.1 },
- subFlagModifier: { x: .98, y: 1.03, scale: 1.03 },
- },
- mercedes: {
- backgroundColor: "#1ee0ad",
- imageSize: 40,
- imagePos: { x: .33, y: .05 },
- subFlagModifier: { x: 1, y: 1, scale: .98 },
- },
- redBull: {
- backgroundColor: "#413ae2",
- imageSize: 88,
- imagePos: { x: .33, y: 0 },
- subFlagModifier: { x: 1.04, y: .2, scale: .92 },
- },
- williams: {
- backgroundColor: "#12a0cb",
- imageSize: 40,
- imagePos: { x: .35, y: .1 },
- subFlagModifier: { x: 1, y: 1, scale: .98 },
- },
+
+// 为所有班级配置一套通用的旗帜样式
+const defaultFlagStyle: TeamFlagStyle = {
+ backgroundColor: "#333333",
+ imageSize: 50,
+ imagePos: { x: .25, y: .0 },
+ subFlagModifier: { x: 1, y: 1, scale: 1 },
};
+export const teamFlagStyles: { [teamId: string]: TeamFlagStyle } = teamIds.reduce((acc, id) => {
+ acc[id] = defaultFlagStyle;
+ return acc;
+}, {} as { [teamId: string]: TeamFlagStyle });
+
export type TeamGemStyle = {
backgroundColor: string,
imageSize: Percent,
- imagePos: {
- x: number,
- y: number,
- },
+ imagePos: { x: number, y: number },
};
-export const teamGemStyles: { [teamId: string]: TeamGemStyle } = {
- alfaRomeo: {
- backgroundColor: "#660000",
- imageSize: 65,
- imagePos: { x: .28, y: .15 },
- },
- alphaTauri: {
- backgroundColor: "#232c3b",
- imageSize: 75,
- imagePos: { x: .26, y: .07 },
- },
- alpine: {
- backgroundColor: "black",
- imageSize: 82,
- imagePos: { x: .13, y: 0 },
- },
- astonMartin: {
- backgroundColor: "#037356",
- imageSize: 130,
- imagePos: { x: .05, y: -.22 },
- },
- ferrari: {
- backgroundColor: "#dc0000",
- imageSize: 65,
- imagePos: { x: .3, y: .18 },
- },
- haas: {
- backgroundColor: "#f0f0f0",
- imageSize: 65,
- imagePos: { x: .25, y: .12 },
- },
- mclaren: {
- backgroundColor: "#545459",
- imageSize: 67,
- imagePos: { x: .25, y: .1 },
- },
- mercedes: {
- backgroundColor: "#1ee0ad",
- imageSize: 63,
- imagePos: { x: .31, y: .16 },
- },
- redBull: {
- backgroundColor: "#413ae2",
- imageSize: 130,
- imagePos: { x: .20, y: .05 },
- },
- williams: {
- backgroundColor: "#12a0cb",
- imageSize: 65,
- imagePos: { x: .3, y: .12 },
- },
+
+// 为所有班级配置一套通用的 Gem 样式
+const defaultGemStyle: TeamGemStyle = {
+ backgroundColor: "#333333",
+ imageSize: 65,
+ imagePos: { x: .25, y: .1 },
};
+
+export const teamGemStyles: { [teamId: string]: TeamGemStyle } = teamIds.reduce((acc, id) => {
+ acc[id] = defaultGemStyle;
+ return acc;
+}, {} as { [teamId: string]: TeamGemStyle });
\ No newline at end of file
diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts
index 720bc27..67a5a6e 100644
--- a/src/features/event/eventSlice.ts
+++ b/src/features/event/eventSlice.ts
@@ -47,30 +47,13 @@ const GRID_POSITION_GAP: Meters = 8;
const POLE_TO_START: Meters = -10;
/**
- * The starting grid, kept as a plain list of driver ids so the roster can be
- * rebuilt (and reset) without twenty near identical object literals.
+ * 【修改点 1】:把初始名单换成了你的 runner1 ~ runner20
*/
const INITIAL_LINEUP: DriverId[] = [
- "verstappen",
- "hamilton",
- "bottas",
- "perez",
- "sainz",
- "norris",
- "leclerc",
- "ricciardo",
- "gasly",
- "alonso",
- "ocon",
- "vettel",
- "stroll",
- "tsunoda",
- "russell",
- "raikkonen",
- "latifi",
- "giovinazzi",
- "schumacher",
- "mazepin",
+ "runner1", "runner2", "runner3", "runner4", "runner5",
+ "runner6", "runner7", "runner8", "runner9", "runner10",
+ "runner11", "runner12", "runner13", "runner14", "runner15",
+ "runner16", "runner17", "runner18", "runner19",
];
function buildInitialGrid(): Grid {
@@ -85,9 +68,10 @@ function buildInitialGrid(): Grid {
}
const initialState: RootState["event"] = {
- trackName: "Circuit de Spa-Franchorchamps",
- trackLength: 7004,
- trackStartFinishDelta: -124,
+ // 【修改点 2】:修改了赛道名和长度(单位是米,400米一圈)
+ trackName: "400M Track - GaoXin Campus",
+ trackLength: 400,
+ trackStartFinishDelta: 0,
courseStatus: {
courseFlag: CourseFlag.Green,
sectorFlags: [SectorFlag.Green, SectorFlag.Green, SectorFlag.Green],
@@ -101,7 +85,7 @@ const initialState: RootState["event"] = {
timeLimit: 60 * 60 * 2 * 1000,
lapCount: 1,
lapAdjust: 0,
- scheduledLaps: 44,
+ scheduledLaps: 2,
},
grid: buildInitialGrid(),
sortedGridSpots: Array.from(Array(INITIAL_LINEUP.length).keys()),
@@ -114,10 +98,6 @@ const initialState: RootState["event"] = {
positionScript: buildInitialPositionScript(),
};
-/**
- * The shipped schedule is parsed once at start up so a broken default can never
- * take the app down - it would simply report an error in the script panel.
- */
function buildInitialPositionScript(): RootState["event"]["positionScript"] {
const { file, error } = parsePositionScriptSafe(DEFAULT_POSITION_SCRIPT_JSON);
return {
@@ -131,11 +111,6 @@ function buildInitialPositionScript(): RootState["event"]["positionScript"] {
};
}
-/**
- * Gives every car the track position of the rank it now occupies. The set of
- * distances is preserved, so the gaps between the cars - and therefore the
- * interval column - survive a reshuffle untouched.
- */
function applyRunningOrder(
state: RootState["event"],
orderedGridSpots: GridSpot[],
@@ -162,13 +137,6 @@ function applyRunningOrder(
return true;
}
-/**
- * Puts the script's `order` list onto the track.
- *
- * Returns `null` on success, or a readable reason why it could not be applied.
- * An unresolvable code used to fail silently, which made one typo in `order`
- * look like the whole feature was broken.
- */
function applyInitialOrder(state: RootState["event"]): Optional {
const { initialOrder } = state.positionScript;
if (initialOrder.length === 0) return null;
@@ -204,7 +172,6 @@ interface SetCarStatusAction {
status: CarStatus;
}
-/** Every driver attribute the roster editor is allowed to touch. */
export type DriverEditableField =
| "firstName"
| "lastName"
@@ -238,10 +205,6 @@ export interface PositionScriptResultAction {
error: Optional;
}
-/**
- * The lap counter shown by the status indicator: whatever the simulation
- * derives from the leader's distance, plus any laps the director added by hand.
- */
function recalculateLapCount(state: RootState["event"], leaderDistance: Meters) {
state.eventProgress.lapCount = Math.max(
1,
@@ -251,12 +214,6 @@ function recalculateLapCount(state: RootState["event"], leaderDistance: Meters)
);
}
-/**
- * Re-sorts the field by distance and recomputes every derived value: positions,
- * the running order and the lap counter. Extracted from the reducer of the same
- * name because the position script needs to run it in the middle of its own
- * reducer.
- */
function recalculateRunningOrder(state: RootState["event"]) {
const sortingGrid = state.grid.map((car, index): Car & {
gridSpot: GridSpot,
@@ -272,58 +229,36 @@ function recalculateRunningOrder(state: RootState["event"]) {
+ state.trackStartFinishDelta;
sortingGrid.forEach((entry, sortedPosition) => {
- // Don't update positions of cars who have crossed the finish line.
if (entry.distance < raceEndDistance) {
state.grid[entry.gridSpot].position = sortedPosition + 1;
}
});
- /**
- * Calculate which lap we're on by taking the leader's distance.
- * Also must consider the fact that the race distance 0 is at the start
- * line, but the race ends at the finish line, which is often (always?)
- * behind the start line by some distance.
- *
- * Any laps the director added by hand are layered on top, so the counter can
- * be pushed forward without rewriting the race itself.
- */
recalculateLapCount(state, sortingGrid[0].distance);
}
-/**
- * Note: Add `state.lastUpdate = Date.now();` to the end of every reducer to
- * keep components up to date that watch for changes with useEffect() functions.
- */
export const eventSlice = createSlice({
name: "event",
initialState,
reducers: {
setCourseFlag: (state, action: PayloadAction) => {
state.courseStatus.courseFlag = action.payload;
-
state.lastUpdate = Date.now();
},
setEventStatus: (state, action: PayloadAction) => {
state.eventStatus = action.payload;
-
state.lastUpdate = Date.now();
},
refreshRunningOrder: (state) => {
recalculateRunningOrder(state);
-
state.lastUpdate = Date.now();
},
increaseDistance: (state, action: PayloadAction) => {
const gridMap = driverToGridMap(state.grid);
-
const { gridSpots, distance, randomness, usePerformance } = action.payload;
gridSpots.forEach(gridSpot => {
const car = state.grid[gridSpot];
-
- // Do not update cars that are DNS, retired, or finished.
- // This does remind me that Finished cars must be treated and reported
- // differently...
if (orMatch(car.status, CarStatus.DidNotStart, CarStatus.Finished, CarStatus.Retired)) {
return;
}
@@ -343,7 +278,6 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
awardFastestLap: (state, action: PayloadAction) => {
- // Awards fastest lap to provided car. Removes fastest lap from anyone else.
state.grid.forEach((car, index) => {
const fastestLapNoticeIndex = car.notices.findIndex(
notice => notice === CarNotice.FastestLap,
@@ -369,46 +303,21 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
-
- /**
- * Driver roster editing.
- *
- * The grid holds the only copy of a driver that the broadcast ever renders,
- * so an edit is written straight onto the car sitting in that grid slot and
- * every graphic picks it up on the next render.
- */
updateDriver: (state, action: PayloadAction) => {
const { gridSpot, field, value } = action.payload;
const driver = state.grid[gridSpot]?.driver;
if (driver == null) return;
switch (field) {
- case "firstName":
- driver.firstName = String(value);
- break;
- case "lastName":
- driver.lastName = String(value);
- break;
- case "initials":
- driver.initials = String(value).toUpperCase().slice(0, 4);
- break;
- case "number":
- driver.number = clampDriverNumber(Number(value));
- break;
- case "nationality":
- driver.nationality = String(value).toUpperCase();
- break;
- case "performance":
- driver.performance = clampPerformance(Number(value));
- break;
- case "yellowTCam":
- driver.yellowTCam = Boolean(value);
- break;
- case "portrait":
- driver.portrait = sanitizePortrait(value);
- break;
- default:
- return;
+ case "firstName": driver.firstName = String(value); break;
+ case "lastName": driver.lastName = String(value); break;
+ case "initials": driver.initials = String(value).toUpperCase().slice(0, 4); break;
+ case "number": driver.number = clampDriverNumber(Number(value)); break;
+ case "nationality": driver.nationality = String(value).toUpperCase(); break;
+ case "performance": driver.performance = clampPerformance(Number(value)); break;
+ case "yellowTCam": driver.yellowTCam = Boolean(value); break;
+ case "portrait": driver.portrait = sanitizePortrait(value); break;
+ default: return;
}
state.lastUpdate = Date.now();
@@ -420,10 +329,8 @@ export const eventSlice = createSlice({
if (driver == null || team == null) return;
driver.team = team;
-
state.lastUpdate = Date.now();
},
- /** Exchanges two cars' drivers without disturbing the race they are running. */
swapDrivers: (state, action: PayloadAction) => {
const { a, b } = action.payload;
if (a === b || state.grid[a] == null || state.grid[b] == null) return;
@@ -434,20 +341,14 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
- /** Restores a single driver to the stock record that ships with the app. */
resetDriver: (state, action: PayloadAction) => {
const car = state.grid[action.payload];
const stock = car == null ? null : cloneDriver(car.driver.id);
if (car == null || stock == null) return;
car.driver = stock;
-
state.lastUpdate = Date.now();
},
- /**
- * Restores the starting lineup. Cars keep the distance they have covered -
- * this puts the original drivers back into the slots they started in.
- */
resetRoster: (state) => {
state.grid.forEach((car, index) => {
const driverId = INITIAL_LINEUP[index];
@@ -457,11 +358,6 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
- /**
- * Bulk replacement used by localStorage rehydration and by the editor's
- * import button. Entries are matched to grid slots by index and every
- * field is validated before it is allowed anywhere near the state.
- */
applyRoster: (state, action: PayloadAction>>) => {
const entries = action.payload;
if (!Array.isArray(entries)) return;
@@ -474,14 +370,6 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
-
- // --------------------------------------------------------------- lap count
- /**
- * Nudges the LAP counter. The offset is remembered separately from the lap
- * the simulation derives from the leader's distance, so the two never fight
- * each other: press +1 and the counter reads one lap further on for the rest
- * of the race.
- */
adjustLap: (state, action: PayloadAction) => {
state.eventProgress.lapAdjust += action.payload;
@@ -490,20 +378,12 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
-
- // -------------------------------------------------------------- show clock
- /**
- * The stopwatch beside the LAP counter. Its zero is the moment the timing
- * graphics appeared, which is also the zero the position script is timed
- * against.
- */
startShowClock: (state) => {
if (state.showClock.startedAt != null) return;
state.showClock.startedAt = Date.now();
if (!state.showClock.hasStarted) {
- // First run: lay down the script's starting order and arm the schedule.
state.showClock.hasStarted = true;
state.positionScript.firedCount = 0;
state.positionScript.orderError = applyInitialOrder(state);
@@ -519,10 +399,6 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
- /**
- * Back to zero and ready to replay the script from the top. The manual lap
- * offset is rewound too, so a replay reproduces the run exactly.
- */
resetShowClock: (state) => {
state.showClock.accumulatedMs = 0;
state.showClock.startedAt = Date.now();
@@ -535,16 +411,9 @@ export const eventSlice = createSlice({
state.lastUpdate = Date.now();
},
-
- // ---------------------------------------------------------- position script
setPositionScriptJson: (state, action: PayloadAction) => {
state.positionScript.json = action.payload;
},
- /**
- * Result of parsing whatever the user has typed. Nothing is thrown away on a
- * bad edit: the error is stored and the last good schedule keeps running.
- * A genuinely different schedule rewinds the run so it can play again.
- */
applyPositionScriptResult: (
state,
action: PayloadAction,
@@ -562,13 +431,6 @@ export const eventSlice = createSlice({
state.positionScript.error = error;
if (next !== previous) {
- /**
- * A changed schedule is meant to be watched. Rewinding the run is what
- * makes editing the JSON feel like "press play": previously only
- * `firedCount` was cleared, so an edit made after a few seconds put every
- * earlier line into the past at once and they all fired together in a
- * burst, which looked like the script had jumped or had not run at all.
- */
state.positionScript.firedCount = 0;
state.eventProgress.lapAdjust = 0;
@@ -577,16 +439,11 @@ export const eventSlice = createSlice({
state.showClock.startedAt = Date.now();
}
- // `order` takes effect on the spot instead of waiting for a reset.
state.positionScript.orderError = applyInitialOrder(state);
}
state.lastUpdate = Date.now();
},
- /**
- * Fires every script line that has come due, in one go, so the running order
- * is only reshuffled once per tick no matter how many lines are waiting.
- */
runPositionScript: (state, action: PayloadAction<{ elapsedMs: number }>) => {
const script = state.positionScript;
const { events } = script;
@@ -608,8 +465,6 @@ export const eventSlice = createSlice({
const gridSpot = findGridSpotByRef(state.grid, reference);
if (gridSpot != null && !spots.includes(gridSpot)) spots.push(gridSpot);
}
- // An unresolvable name is skipped rather than stalling the schedule.
- // "lap" is the one action that carries no driver to resolve.
if (spots.length === 0 && event.action !== "lap") continue;
switch (event.action) {
@@ -644,8 +499,6 @@ export const eventSlice = createSlice({
}
}
- // Nothing came due: leave the state untouched so the 100ms tick does not
- // ripple a re-render through the whole broadcast.
if (fired === script.firedCount) return;
script.firedCount = fired;
@@ -689,4 +542,4 @@ export const {
applyPositionScriptResult,
runPositionScript,
} = eventSlice.actions;
-export default eventSlice.reducer;
+export default eventSlice.reducer;
\ No newline at end of file
diff --git a/src/public/images/logos/rolex-yellow.svg b/src/public/images/logos/rolex-yellow.svg
index e537e98..dc1ced5 100644
--- a/src/public/images/logos/rolex-yellow.svg
+++ b/src/public/images/logos/rolex-yellow.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/types/state.ts b/src/types/state.ts
index b4cb056..215df0f 100644
--- a/src/types/state.ts
+++ b/src/types/state.ts
@@ -84,7 +84,7 @@ export interface OverlayItem {
export interface Event {
trackName: string;
trackLength: Meters;
- trackStartFinishDelta: Meters; // Negative if finish behind start line.
+ trackStartFinishDelta: Meters;
courseStatus: CourseStatus;
eventStatus: EventStatus;
eventMode: EventMode;
@@ -92,74 +92,47 @@ export interface Event {
grid: Grid;
sortedGridSpots: GridSpot[];
lastUpdate: number;
- /** Time elapsed since the timing graphics first appeared on screen. */
showClock: ShowClock;
- /** A JSON authored schedule of running order changes. */
positionScript: PositionScript;
}
export interface EventProgress {
startTime: Milliseconds;
timeLimit: Milliseconds;
lapCount: number;
- /**
- * Laps added by hand on top of the lap the simulation derives from the
- * leader's distance, so the director can push the counter forward (or back)
- * without disturbing the race itself.
- */
lapAdjust: number;
scheduledLaps: number;
}
-/**
- * The stopwatch that runs alongside the LAP counter. Its zero is the moment the
- * timing board appeared, which is also what the position script is timed
- * against.
- */
export interface ShowClock {
- /** Timestamp the clock was last started, or null while it is paused. */
startedAt: Optional;
- /** Milliseconds banked by the runs that came before. */
accumulatedMs: Milliseconds;
- /** True once the clock has run at least once. */
hasStarted: boolean;
}
export type PositionScriptAction = "swap" | "move" | "retire" | "restore" | "lap";
export interface PositionScriptEvent {
- /** Milliseconds after the clock's zero. */
at: Milliseconds;
action: PositionScriptAction;
- /**
- * Driver references. A reference may be a driver id ("verstappen"), a three
- * letter code ("VER") or a car number ("33").
- */
drivers: string[];
- /** Target position (1 based) for "move". */
to?: number;
- /** Lap delta for "lap". */
value?: number;
}
export interface PositionScript {
- /** Exactly what the user is editing, kept as text. */
json: string;
- /** The last schedule that parsed, sorted by time. */
events: PositionScriptEvent[];
- /** Drivers placed at the start of a run, in running order. */
initialOrder: string[];
autoStart: boolean;
error: Optional;
- /** Why the `order` list could not be put on track, if it could not. */
orderError: Optional;
- /** How many events of the current run have already fired. */
firedCount: number;
}
export enum EventStatus {
- Waiting, // Event is waiting to start.
- Running, // Event is running.
- Stopped, // Event has concluded.
- Suspended, // Event is suspended (ex: rain delay).
+ Waiting,
+ Running,
+ Stopped,
+ Suspended,
}
export enum EventMode {
Race,
@@ -195,15 +168,13 @@ export enum SectorFlag {
export enum SafetyCarStatus { Clear, Starting, Out, Ending }
export enum VirtualSafetyCarStatus { Clear, Active, Ending }
-export type Grid = Car[]; // Grid order does not change.
-export type GridSpot = number; // GridSpot doesn't change. Starts at 0.
+export type Grid = Car[];
+export type GridSpot = number;
export interface Car {
- position: number; // Position is DERIVED from distance and status.
+ position: number;
driver: Driver;
status: CarStatus;
tyre: Tyre;
- // tyreHistory: Tyre[];
- // pitsCompleted: number;
notices: CarNotice[];
distance: Meters;
}
@@ -215,39 +186,13 @@ export interface Driver {
team: Team;
yellowTCam: boolean;
initials: string;
- nationality: string; // ISO 3166-1 alpha-3 codes
- performance: Fraction; // Versus teammate
- /**
- * Optional portrait override. Portraits are picked from the images bundled in
- * public/images/drivers/front. When omitted the driver's own id is used, so
- * any driver that never gets edited keeps behaving exactly as before.
- */
+ nationality: string;
+ performance: Fraction;
portrait?: string;
}
-export type DriverId =
- | "albon"
- | "alonso"
- | "bottas"
- | "gasly"
- | "giovinazzi"
- | "hamilton"
- | "kubica"
- | "latifi"
- | "leclerc"
- | "mazepin"
- | "norris"
- | "ocon"
- | "perez"
- | "raikkonen"
- | "ricciardo"
- | "russell"
- | "sainz"
- | "schumacher"
- | "stroll"
- | "tsunoda"
- | "verstappen"
- | "vettel"
- | "zhou";
+
+// 【关键修复】:改成了 string,彻底解除限制
+export type DriverId = string;
export enum CarStatus {
Normal,
@@ -286,55 +231,23 @@ export enum TyreCompound {
Intermediate,
}
-
export interface Team {
id: TeamId;
shortName: TeamShortName;
fullName: TeamFullName;
- nationality: string; // ISO 3166-1 alpha-3 codes
+ nationality: string;
performance: Fraction;
- // logo: string;
}
-export type TeamId =
- | "alfaRomeo"
- | "alphaTauri"
- | "alpine"
- | "astonMartin"
- | "ferrari"
- | "haas"
- | "mclaren"
- | "mercedes"
- | "redBull"
- | "williams";
-export type TeamShortName =
- | "Alfa Romeo"
- | "AlphaTauri"
- | "Alpine"
- | "Aston Martin"
- | "Ferrari"
- | "Haas F1 Team"
- | "McLaren"
- | "Mercedes"
- | "Red Bull Racing"
- | "Williams";
-export type TeamFullName =
- | "Alfa Romeo F1 Team ORLEN"
- | "Scuderia AlphaTauri"
- | "Alpine F1 Team"
- | "Aston Martin Cognizant Formula One Team"
- | "Scuderia Ferrari"
- | "Uralkali Haas F1 Team"
- | "McLaren F1 Team"
- | "Mercedes-AMG Petronas Formula One Team"
- | "Red Bull Racing"
- | "Williams Racing";
+
+// 【关键修复】:车队全部改成 string,不再限制只能填 F1 车队
+export type TeamId = string;
+export type TeamShortName = string;
+export type TeamFullName = string;
// Broadcast Director
export interface BroadcastDirector {
selectedCars: GridSpot[];
- /** The car the keyboard cursor is parked on. Never changes on its own. */
cursorGridSpot: Optional;
- /** Everything the chyron director controls need to build a chyron. */
chyronSettings: ChyronSettings;
}
export interface ChyronSettings {
@@ -350,17 +263,11 @@ export interface ChyronSettings {
export interface BGBaseState {
openState: OpenState;
}
-/**
- * -1 closing, 0 closed, 1 open, 2... different states (for progressive anims)
- */
export type OpenState = number;
export interface BroadcastGraphics {
timingBoard: BGTimingBoard;
- // indicators: BGIndicators
chyrons: Optional;
- // gems: BGGems
- // toasts: BGToasts;
}
// Timing Board
@@ -374,8 +281,8 @@ export interface BGStatusIndicator {
mode: BGStatusIndicatorModes;
}
export enum BGStatusIndicatorModes {
- LapNarrow, // "LAP" above "##/##" lap count.
- LapWide, // "LAP" to the left of "##/##" lap count.
+ LapNarrow,
+ LapWide,
}
// Timing Tower
@@ -393,15 +300,14 @@ export enum BGTimingTowerDisplayMode {
FullLeft,
}
export enum BGTimingTowerSplitsMode {
- Leader, // Leader timing.
- Interval, // Interval timing.
+ Leader,
+ Interval,
}
export enum BGTimingTowerFocusedCarsMode {
- None, // When no special treatments are made.
- Portrait, // When it shows the portrait of the driver.
+ None,
+ Portrait,
}
-
// Chyrons
export type BGChyronMode = string;
export type BGChyronSubMode = string;
@@ -412,7 +318,6 @@ export interface BGChyrons extends BGBaseState {
primary: BGChyronDriver;
secondary: Optional;
}
- // sponsorGem: BGSponsorGem;
}
export interface BGChyronDriver {
@@ -422,4 +327,4 @@ export interface BGChyronDriver {
showDriverNumber: boolean;
showPortrait: boolean;
}
-export type FlagMode = "country" | "team" | "none";
+export type FlagMode = "country" | "team" | "none";
\ No newline at end of file
diff --git a/src/utils/positionScript.ts b/src/utils/positionScript.ts
index a610145..2e98e39 100644
--- a/src/utils/positionScript.ts
+++ b/src/utils/positionScript.ts
@@ -35,15 +35,34 @@ export const POSITION_SCRIPT_ACTIONS: PositionScriptAction[] = [
export const DEFAULT_POSITION_SCRIPT: PositionScriptFile = {
autoStart: true,
initialOrder: [
- "VER", "HAM", "BOT", "PER", "SAI", "NOR", "LEC", "RIC", "GAS", "ALO",
- "OCO", "VET", "STR", "TSU", "RUS", "RAI", "LAT", "GIO", "MSC", "MAZ",
+ "YLI", "YUZ", "SQI", "LIU", "ZHA", "YWE", "ZHU", "DEN", "WAN", "WHA",
+ "PAN", "JWE", "JQI", "LIA", "XIA", "ZLI", "LUG", "HWE", "LIH",
],
events: [
- { at: 5000, action: "swap", drivers: ["HAM", "VER"] },
- { at: 12000, action: "move", drivers: ["LEC"], to: 3 },
- { at: 18500, action: "lap", drivers: [], value: 1 },
- { at: 24000, action: "retire", drivers: ["MAZ"] },
- { at: 31000, action: "restore", drivers: ["MAZ"] },
+ { at: 30060, action: "move", drivers: ["LUG"], to: 16 },
+ { at: 30060, action: "move", drivers: ["ZLI"], to: 17 },
+ { at: 33010, action: "move", drivers: ["LIU"], to: 3 },
+ { at: 33010, action: "move", drivers: ["SQI"], to: 4 },
+ { at: 33200, action: "move", drivers: ["ZLI"], to: 18 },
+ { at: 33200, action: "move", drivers: ["HWE"], to: 17 },
+ { at: 36000, action: "move", drivers: ["XIA"], to: 13 },
+ { at: 36000, action: "move", drivers: ["LIA"], to: 14 },
+ { at: 39220, action: "move", drivers: ["YUZ"], to: 1 },
+ { at: 39220, action: "move", drivers: ["YLI"], to: 2 },
+ { at: 39220, action: "move", drivers: ["ZHA"], to: 4 },
+ { at: 39220, action: "move", drivers: ["SQI"], to: 5 },
+ { at: 47000, action: "move", drivers: ["JQI"], to: 13 },
+ { at: 47000, action: "move", drivers: ["XIA"], to: 12 },
+ { at: 55000, action: "move", drivers: ["DEN"], to: 7 },
+ { at: 55000, action: "move", drivers: ["ZHU"], to: 8 },
+ { at: 60210, action: "move", drivers: ["LIU"], to: 2 },
+ { at: 60210, action: "move", drivers: ["YLI"], to: 3 },
+ { at: 60210, action: "move", drivers: ["YWE"], to: 5 },
+ { at: 60210, action: "move", drivers: ["SQI"], to: 6 },
+ { at: 67000, action: "move", drivers: ["DEN"], to: 6 },
+ { at: 67000, action: "move", drivers: ["SQI"], to: 7 },
+ { at: 89040, action: "move", drivers: ["ZHA"], to: 3 },
+ { at: 89040, action: "move", drivers: ["YLI"], to: 4 },
],
};
@@ -253,4 +272,4 @@ export function describeScriptEvent(event: PositionScriptEvent): string {
default:
return event.action;
}
-}
+}
\ No newline at end of file