v1.2.1(重发): 修复刷新误标已占领(缓存击穿+宽限期60s+防误判)、修复GUI/刷新卡顿与内存(视口过滤/后台预计算/零复制校验/内容去重/ChunkPos驻留)、区域扩地重写为严格S形由内而外(起始边离王城最近)
这个提交包含在：
lyizai
@@ -74,8 +74,20 @@ public final class TerritoryDataService {
|
||||
* <p>占领成功后，服务器动态地图（Dynmap/markers.json）可能尚未同步该区块，
|
||||
* 因此在宽限期内即使地图未确认也先保留"会话占领"标记，避免刚占领的区块被误判为假占领。
|
||||
* 超过宽限期仍未在地图中确认的，视为未真正占领并丢弃，使空洞区块能重新进入规划。
|
||||
* （v1.2.1 由 120 秒缩短为 60 秒：配合请求侧缓存击穿，Dynmap 秒级同步，缩短可更快修正假占领）</p>
|
||||
*/
|
||||
private static final long CLAIM_CONFIRM_GRACE_MS = 120_000L;
|
||||
private static final long CLAIM_CONFIRM_GRACE_MS = 60_000L;
|
||||
/**
|
||||
* ChunkPos 驻留池：坐标 → 复用实例。
|
||||
*
|
||||
* <p>每次解析 markers.json 会创建约 8 万个 ChunkPos，且各次刷新的坐标高度重合。
|
||||
* 驻留后新旧模型共享同一批实例，刷新时垃圾量从"整份模型"降为"集合外壳"，
|
||||
* 显著降低 GC 压力（缓解刷新时游戏卡顿与内存占用）。</p>
|
||||
*/
|
||||
private static final ConcurrentHashMap<Long, ChunkPos> CHUNK_POOL = new ConcurrentHashMap<Long, ChunkPos>();
|
||||
/** 上次成功响应的正文哈希与长度，用于识别"网络缓存返回了相同旧数据"并跳过重复解析 */
|
||||
private volatile int lastBodyHash;
|
||||
private volatile int lastBodyLength = -1;
|
||||
|
||||
public TerritoryDataService() {
|
||||
this.executor = TerritoryDataService.newExecutor();
|
||||
@@ -129,12 +141,28 @@ public final class TerritoryDataService {
|
||||
this.executor.execute(() -> {
|
||||
this.lastAttemptMillis = System.currentTimeMillis();
|
||||
try {
|
||||
HttpRequest request = HttpRequest.newBuilder(URI.create(MARKERS_URL)).timeout(Duration.ofSeconds(15L)).header("User-Agent", "Mozilla/5.0 autostore/1.0").GET().build();
|
||||
// 请求侧缓存击穿：URL 追加时间戳参数 + no-cache 头，确保每次都拿到服务器最新数据。
|
||||
// 此前约半数刷新命中网络缓存拿到旧数据，导致会话占领迟迟无法被地图确认/纠正。
|
||||
String url = MARKERS_URL + "?_=" + System.currentTimeMillis();
|
||||
HttpRequest request = HttpRequest.newBuilder(URI.create(url)).timeout(Duration.ofSeconds(15L))
|
||||
.header("User-Agent", "Mozilla/5.0 autostore/1.2.1")
|
||||
.header("Cache-Control", "no-cache, no-store")
|
||||
.header("Pragma", "no-cache").GET().build();
|
||||
HttpResponse<String> response = this.httpClient.send(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
|
||||
if (response.statusCode() < 200 || response.statusCode() >= 300) {
|
||||
this.lastError = "HTTP " + response.statusCode();
|
||||
return;
|
||||
}
|
||||
String body = response.body();
|
||||
// 内容未变化（服务器确实无更新，或缓存仍命中相同旧文）：跳过重复解析，
|
||||
// 避免"每次刷新都重建 8 万区块模型"的 CPU/GC 开销；模型与飞地缓存保持原样。
|
||||
if (body.length() == this.lastBodyLength && body.hashCode() == this.lastBodyHash) {
|
||||
this.lastSuccessfulFetchMillis = System.currentTimeMillis();
|
||||
this.lastError = "";
|
||||
return;
|
||||
}
|
||||
this.lastBodyHash = body.hashCode();
|
||||
this.lastBodyLength = body.length();
|
||||
TerritoryModel parsed = TerritoryDataService.parse(response.body());
|
||||
TerritoryModel previous = this.model;
|
||||
if (previous != null) {
|
||||
@@ -160,6 +188,9 @@ public final class TerritoryDataService {
|
||||
}
|
||||
}
|
||||
parsed.setSelfStateName(this.selectedStateName);
|
||||
// 后台线程预计算飞地缓存：把"各国外接矩形全量扫描"从渲染帧挪到这里，
|
||||
// 修复"刷新地图/打开 GUI 时游戏卡一下"的问题
|
||||
parsed.precomputeFlyingChunks();
|
||||
this.model = parsed;
|
||||
this.lastSuccessfulFetchMillis = System.currentTimeMillis();
|
||||
this.lastError = "";
|
||||
@@ -375,12 +406,21 @@ public final class TerritoryDataService {
|
||||
}
|
||||
}
|
||||
if (inside) {
|
||||
output.add(new ChunkPos(cx, cz));
|
||||
output.add(TerritoryDataService.internChunk(cx, cz));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 驻留池获取区块坐标实例：同一坐标跨模型复用同一对象。
|
||||
* 刷新频率下大幅减少 ChunkPos 临时分配与 GC 压力（见 {@link #CHUNK_POOL}）。
|
||||
*/
|
||||
private static ChunkPos internChunk(int x, int z) {
|
||||
long key = (long)x << 32 | (long)z & 0xFFFFFFFFL;
|
||||
return TerritoryDataService.CHUNK_POOL.computeIfAbsent(key, k -> new ChunkPos(x, z));
|
||||
}
|
||||
|
||||
/** 射线法判断点 (x, z) 是否在多边形内（经典奇偶规则） */
|
||||
private static boolean pointInPolygon(int x, int z, List<int[]> polygon) {
|
||||
boolean inside = false;
|
||||
|
||||
@@ -41,8 +41,12 @@ public final class TerritoryModel {
|
||||
* <p>飞地指"四周（四个正方向）都被同一邦国占领、但自身未被占领"的区块，
|
||||
* 通常是自动扩地时漏掉的疏漏。该结果在模型构建后懒计算并缓存，
|
||||
* 仅在新增会话占领（addSessionClaim）后失效重算。
|
||||
* 字段为 volatile：后台线程可调用 {@link #precomputeFlyingChunks()} 预热，
|
||||
* 渲染线程读取时保证可见性，避免把全量扫描留在渲染帧里（卡顿来源）。</p>
|
||||
*/
|
||||
private transient Map<String, Set<ChunkPos>> cachedFlyingChunks;
|
||||
private transient volatile Map<String, Set<ChunkPos>> cachedFlyingChunks;
|
||||
/** 所有邦国飞地的合并并集缓存（volatile，同上）；仅少量区块，供 GUI 直接遍历 */
|
||||
private transient volatile Set<ChunkPos> cachedAllFlyingChunks;
|
||||
|
||||
public TerritoryModel(Map<String, TerritoryState> states) {
|
||||
this.states = new HashMap<String, TerritoryState>(states);
|
||||
@@ -103,17 +107,23 @@ public final class TerritoryModel {
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回所有邦国的飞地（疏漏区块）并集（只读视图）。
|
||||
* 返回所有邦国的飞地（疏漏区块）并集（只读视图，结果缓存，帧间零分配）。
|
||||
*
|
||||
* <p>飞地指“四周（四个正方向）都被同一邦国占领、但自身未被占领”的区块。
|
||||
* 这些往往是自动扩地过程中漏掉的疏漏，需要在地图上标出并优先填补。</p>
|
||||
*/
|
||||
public Set<ChunkPos> flyingChunks() {
|
||||
Set<ChunkPos> cached = this.cachedAllFlyingChunks;
|
||||
if (cached != null) {
|
||||
return cached;
|
||||
}
|
||||
HashSet<ChunkPos> result = new HashSet<ChunkPos>();
|
||||
for (Set<ChunkPos> chunks : this.flyingChunksByState().values()) {
|
||||
result.addAll(chunks);
|
||||
}
|
||||
return result;
|
||||
Set<ChunkPos> frozen = Collections.unmodifiableSet(result);
|
||||
this.cachedAllFlyingChunks = frozen;
|
||||
return frozen;
|
||||
}
|
||||
|
||||
/** 返回己方邦国的飞地（疏漏区块）（只读视图）；未选择邦国时为空集 */
|
||||
@@ -121,6 +131,15 @@ public final class TerritoryModel {
|
||||
return Collections.unmodifiableSet(this.flyingChunksByState().getOrDefault(this.selfStateName, Set.of()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台预计算飞地缓存（在数据刷新线程调用）：
|
||||
* 把"各国外接矩形全量扫描"提前到后台线程完成，
|
||||
* 渲染线程读到的永远是现成缓存，避免模型刷新后第一帧卡顿。
|
||||
*/
|
||||
public void precomputeFlyingChunks() {
|
||||
this.flyingChunks();
|
||||
}
|
||||
|
||||
/** 计算并缓存各邦国的飞地区块（懒加载，addSessionClaim 后失效重算） */
|
||||
private Map<String, Set<ChunkPos>> flyingChunksByState() {
|
||||
Map<String, Set<ChunkPos>> cached = this.cachedFlyingChunks;
|
||||
@@ -184,6 +203,7 @@ public final class TerritoryModel {
|
||||
this.sessionClaims.add(chunk);
|
||||
this.allClaimed.add(chunk);
|
||||
this.cachedFlyingChunks = null;
|
||||
this.cachedAllFlyingChunks = null;
|
||||
TerritoryState self = this.states.get(this.selfStateName);
|
||||
if (self != null) {
|
||||
HashSet<ChunkPos> updated = new HashSet<ChunkPos>(self.chunks());
|
||||
|
||||
在新工单中引用
屏蔽一个用户