merge: P17 起时钩子修复与黄昏精修（独立复验全绿 Desktop 108/Kernel 89）

1 files changed, 22 insertions, 5 deletions

diff --git a/src/LivingVillage.Desktop/Game.fs b/src/LivingVillage.Desktop/Game.fs
index 3f3a1d8..765cea8 100644
--- a/src/LivingVillage.Desktop/Game.fs
+++ b/src/LivingVillage.Desktop/Game.fs
@@ -126,8 +126,24 @@ type LivingVillageGame() as this =
     let mutable cjkAtlas = Unchecked.defaultof<Texture2D>
     let mutable pixel = Unchecked.defaultof<Texture2D>
     let renderPlan = VillageArt.sampleRenderPlan ()
+    // Evidence hook: pin the starting wall-clock hour (e.g. 20.75 for 黄昏), desktop-only.
+    let startHourOverride =
+        match Environment.GetEnvironmentVariable("LV_AUTOPLAY_START_HOUR") with
+        | null | "" -> None
+        | value ->
+            match Double.TryParse(value, Globalization.NumberStyles.Float, Globalization.CultureInfo.InvariantCulture) with
+            | true, hour -> Some hour
+            | _ -> None
+    // Single source of truth for the starting tick so the sample/autoplay path (which
+    // re-creates the world via StartNewGame) honours the evidence hour too.
+    let evidenceStartTick () =
+        M6Presentation.resolveStartTick startHourOverride daylightAutoplay
+    let withStartTick (world: World) : World =
+        let tick = evidenceStartTick ()
+        { world with Tick = tick; Time = float tick * Sim.dtSeconds }
     let createInitialWorld () =
         WorldBootstrap.initialWorldForDaylight daylightAutoplay 42UL Sim.npcCount
+        |> withStartTick
     let mutable world = createInitialWorld ()
     let mutable camera = Vector2.Zero
     let mutable avatarFacing = VillageArt.SouthFacing
@@ -210,17 +226,18 @@ type LivingVillageGame() as this =
         this.CenterCamera()
 
     member private this.StartNewGame (occupation: Occupation.Kind option) =
+        let startTick = evidenceStartTick ()
         let state =
             occupation
-            |> Option.map (fun kind ->
-                let startTick = if daylightAutoplay then 6L * Sim.ticksPerDay / 24L else 0L
-                WorldBootstrap.occupationStateFor 42UL kind startTick)
-        world <- WorldBootstrap.initialWorldWithOccupation daylightAutoplay 42UL Sim.npcCount state
+            |> Option.map (fun kind -> WorldBootstrap.occupationStateFor 42UL kind startTick)
+        world <-
+            WorldBootstrap.initialWorldWithOccupation daylightAutoplay 42UL Sim.npcCount state
+            |> withStartTick
         this.ResetWorldView()
         m5View <- { m5View with Task = state }
         menu <- menu |> MenuState.setCurrentWorld true |> MenuState.enterGame
         let occupationName = occupation |> Option.map Occupation.nameOf |> Option.defaultValue "none"
-        printfn $"new-game=ok seed=42 npcs={Sim.npcCount} occupation={occupationName}"
+        printfn $"new-game=ok seed=42 npcs={Sim.npcCount} occupation={occupationName} tick={world.Tick}"
 
     member private this.SaveWorld (prefix: string) : bool =
         try