3cf83ed6-dca1-44be-bf7a-a27d19337739

This commit is contained in:
2026-06-24 01:05:43 +00:00
parent 7cfbc8aba0
commit 23fb451a0b
10 changed files with 2157 additions and 93 deletions
+2 -17
View File
@@ -49,7 +49,6 @@ export function ExpeditionPanel() {
const resolveCurrentNode = useGameStore((s) => s.resolveCurrentNode);
const advanceNode = useGameStore((s) => s.advanceNode);
const abortExpedition = useGameStore((s) => s.abortExpedition);
const dismissExpedition = useGameStore((s) => s.dismissExpedition);
const { toast } = useToast();
const [lastLog, setLastLog] = useState<string | null>(null);
const [now, setNow] = useState(() => Date.now());
@@ -109,10 +108,8 @@ export function ExpeditionPanel() {
};
// ===== 无活跃探险:展示入口 =====
// v0.10 工单 #2 修复:探险结束自动清空 activeExpedition,无需 justFinished 判断
if (!activeExpedition || activeExpedition.finished) {
// v0.9 工单修复:如果探险刚结束(finished 且有摘要),显示结算面板
const justFinished = activeExpedition?.finished && lastExpeditionSummary &&
Date.now() - lastExpeditionSummary.finishedAt < 60000;
return (
<div className="flex flex-col gap-3 h-full">
<div className="flex items-center justify-between">
@@ -123,7 +120,7 @@ export function ExpeditionPanel() {
<span className="text-[10px] text-muted-foreground"> {totalExpeditions} </span>
</div>
{/* v0.9 工单修复:上次探险结果摘要 */}
{/* v0.9 工单修复:上次探险结果摘要(不限时间,常驻展示) */}
{lastExpeditionSummary && (
<div
className={`rounded-xl border p-2.5 relative overflow-hidden ${
@@ -224,18 +221,6 @@ export function ExpeditionPanel() {
))}
</div>
)}
{/* v0.9 工单修复:刚结束的探险,显示"返回"按钮 */}
{justFinished && (
<Button
onClick={() => dismissExpedition()}
variant="outline"
size="sm"
className="h-7 text-[11px] border-amber-400/30 text-amber-200"
>
</Button>
)}
</div>
);
}