-
+
-
+
-
+
-
+
-
+
- ![Image]()
diff --git a/assets/game-api.js b/assets/game-api.js
index 58e8669..b7aeddf 100644
--- a/assets/game-api.js
+++ b/assets/game-api.js
@@ -370,4 +370,46 @@ const API = {
},
// 暴露后端 base，供图片等静态资源 URL 拼接（本地跨域→8069；线上同域→''）
base: API_CONFIG.base,
+
+ // ---------- 资源系统（库存 / 结算 / 离线囤积回收） ----------
+ async worldResources(q, r) {
+ try {
+ const qs = (q !== undefined && r !== undefined) ? ('?q=' + q + '&r=' + r) : '';
+ const r0 = await fetch(_worldUrl('/yt_world/api/world/resources') + qs, { credentials: _wcred });
+ if (!r0.ok) return { ok: false, error: 'http_' + r0.status };
+ return await r0.json();
+ } catch (e) {
+ return { ok: false, error: 'network', detail: String(e && e.message || e) };
+ }
+ },
+ async worldSettle(auto_collect = false, force_collect = false) {
+ try {
+ const r0 = await fetch(_worldUrl('/yt_world/api/world/settle'), {
+ method: 'POST', credentials: _wcred,
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ auto_collect, force_collect }),
+ });
+ if (r0.redirected || (r0.url && r0.url.indexOf('/web/login') >= 0)) {
+ return { ok: false, error: 'auth' };
+ }
+ return await r0.json();
+ } catch (e) {
+ return { ok: false, error: 'network', detail: String(e && e.message || e) };
+ }
+ },
+ async collectBuilding(q, r, i, j) {
+ try {
+ const r0 = await fetch(_worldUrl('/yt_world/api/building/collect'), {
+ method: 'POST', credentials: _wcred,
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ q, r, i, j }),
+ });
+ if (r0.redirected || (r0.url && r0.url.indexOf('/web/login') >= 0)) {
+ return { ok: false, error: 'auth' };
+ }
+ return await r0.json();
+ } catch (e) {
+ return { ok: false, error: 'network', detail: String(e && e.message || e) };
+ }
+ },
};
diff --git a/world.html b/world.html
index ad323f8..efdca81 100644
--- a/world.html
+++ b/world.html
@@ -2585,6 +2585,12 @@ function microPatrolArrive(p, roadSet, u) {
let microBuildMode = false; // 是否处于建造模式
let microBuildSel = null; // 当前选中素材 id（用于放置新副本）
let microBuildings = {}; // 按地块存：{ 'q,r': [{i,j,type,rot,w,h}] }，避免跨地块串味
+// ===== 资源系统：世界库存 + 本地块建筑囤积（离线产出）缓存 =====
+let microStockCache = {}; // resource_code -> {amount, rate_per_min, capacity, last_settle}
+let microInstanceCache = {}; // 'i,j' -> {id, code, i, j, rot, level, stored, last_tick}
+let microCollectHints = []; // 每帧重建：[{x, y, i, j}] 世界坐标下的可点击回收徽标
+let microResourceTimer = null; // 在线定时结算计时器
+let microSettleLock = false; // 防止 settle 并发请求导致重复/覆盖
let microGhost = { i: 0, j: 0 }; // 放置预览锚点格（左上角），随鼠标浮动
let microEditRef = null; // 正在编辑（可移动/旋转/删除）的已放置建筑
let microEditDrag = false; // 拖拽移动已放置建筑中？
@@ -3413,6 +3419,9 @@ function enterMicroWorld(tile) {
microLoadCatalog(); // 拉取 Odoo 后台建造目录（未登录时保留前端兜底常量），hover/弹窗即时生效
microLoadGame(); // 拉取角色 / 生物 / 订单（Odoo 后端），覆盖单位状态
fetchTasks(); // 拉取任务定义 + 角色进度（新手主线）
+ // 资源系统：登录时一次性结算离线产出并兜底回库，再启动在线自动进账
+ microSettle(true, true).then(() => microRefreshResources());
+ startResourceLoop();
// 初始化角色动画系统
if (typeof preloadAllSheets === 'function') preloadAllSheets();
if (typeof updateCharPlacePanel === 'function') updateCharPlacePanel();
@@ -3458,6 +3467,103 @@ function enterMicroWorld(tile) {
}, MICRO_ENTER_HOLD);
}
+// ============ 资源系统：库存拉取 / 结算 / 回收 ============
+function fmtNum(v) {
+ v = Number(v) || 0;
+ if (Math.abs(v) >= 100) return String(Math.round(v));
+ return String(Math.round(v * 10) / 10);
+}
+// 拉取世界库存 + 当前地块建筑囤积，刷新缓存与右侧面板
+async function microRefreshResources() {
+ if (!microState || !microState.tile) return;
+ const { q, r } = microState.tile;
+ const res = await API.worldResources(q, r);
+ if (!res || !res.ok) return;
+ microStockCache = res.stocks || {};
+ microInstanceCache = {};
+ (res.instances || []).forEach(inst => { microInstanceCache[inst.i + ',' + inst.j] = inst; });
+ updateSidebar();
+}
+// 触发一次世界结算：auto_collect=true 在线增量自动进账；force_collect=true 额外回收建筑已有囤积
+async function microSettle(auto_collect, force_collect) {
+ if (microSettleLock) return { ok: false, error: 'busy' };
+ microSettleLock = true;
+ try {
+ console.log('[yt_world] settle start', { auto_collect, force_collect });
+ const res = await API.worldSettle(auto_collect, force_collect);
+ if (res && res.ok) {
+ microStockCache = res.stocks || microStockCache;
+ console.log('[yt_world] settle ok', { produced: res.produced, collected: res.collected });
+ } else {
+ console.warn('[yt_world] settle fail', res);
+ }
+ return res;
+ } finally {
+ microSettleLock = false;
+ }
+}
+// 回收某建筑囤积到世界库存（点击徽标触发）
+async function microCollectAt(i, j) {
+ if (!microState || !microState.tile) return;
+ const { q, r } = microState.tile;
+ const res = await API.collectBuilding(q, r, i, j);
+ if (res && res.ok) {
+ microStockCache = res.stocks || microStockCache;
+ delete microInstanceCache[i + ',' + j];
+ const parts = Object.entries(res.collected || {}).map(([k, v]) => k + ' +' + fmtNum(v));
+ microToast(parts.length ? ('已回收：' + parts.join('，')) : '无囤积资源');
+ updateSidebar();
+ } else {
+ microRefreshResources();
+ }
+}
+// 在线定时：每 30s 结算一次在线增量自动进账；用递归 setTimeout 避免重叠请求
+function startResourceLoop() {
+ if (microResourceTimer) clearTimeout(microResourceTimer);
+ const loop = async () => {
+ if (!microState || !microState.tile) {
+ microResourceTimer = null;
+ return;
+ }
+ await microSettle(true, false);
+ microRefreshResources();
+ microResourceTimer = setTimeout(loop, 30000);
+ };
+ microResourceTimer = setTimeout(loop, 30000);
+}
+
+// 切回页面时立即兜底结算，避免浏览器节流/标签页休眠导致资源中断
+if (typeof document !== 'undefined') {
+ document.addEventListener('visibilitychange', () => {
+ if (!document.hidden && microState && microState.tile) {
+ console.log('[yt_world] visibility visible, catch up settle');
+ microSettle(true, true).then(() => microRefreshResources());
+ }
+ });
+}
+// 在网格世界坐标 (wx,wy) 处绘制"可回收囤积"徽标（随 zoom 缩放）
+function microDrawCollectHint(ctx, wx, wy) {
+ const t = (microState ? microState.animTime : 0);
+ const pulse = 0.5 + 0.5 * Math.sin(t * 4);
+ ctx.save();
+ ctx.translate(wx, wy);
+ ctx.beginPath();
+ ctx.arc(0, 0, 15 + pulse * 3, 0, Math.PI * 2);
+ ctx.fillStyle = 'rgba(255,196,60,0.22)';
+ ctx.fill();
+ ctx.beginPath();
+ ctx.arc(0, 0, 13, 0, Math.PI * 2);
+ ctx.fillStyle = '#ffb300';
+ ctx.fill();
+ ctx.lineWidth = 2; ctx.strokeStyle = '#ffffff'; ctx.stroke();
+ ctx.strokeStyle = '#5a3b00'; ctx.lineWidth = 2.5; ctx.lineCap = 'round';
+ ctx.beginPath();
+ ctx.moveTo(0, -6); ctx.lineTo(0, 5);
+ ctx.moveTo(-4, 1); ctx.lineTo(0, 5); ctx.lineTo(4, 1);
+ ctx.stroke();
+ ctx.restore();
+}
+
function calcResources(tile) {
const res = {};
if (tile.hasBuilding && BUILDINGS[tile.buildingType]) {
@@ -3479,15 +3585,25 @@ function updateSidebar() {
} else { buildingDiv.innerHTML = '
—
'; }
const resDiv = document.getElementById('detailResources');
- const res = microState.resources;
- if (Object.keys(res).length > 0) {
- const resNames = { food:'🍖 食物', wood:'🪵 木材', metal:'⛏ 金属', gold:'💰 金币', culture:'🏛 文化', research:'🔬 科研', defense:'🛡 防御', military:'⚔ 军事', pop:'👥 人口' };
- resDiv.innerHTML = Object.entries(res).map(([k,v]) => `
- ${resNames[k]||k}
-
- +${v}
`).join('');
- } else { resDiv.innerHTML = '无产出
'; }
+ const stocks = microStockCache || {};
+ const stockEntries = Object.entries(stocks).filter(([, s]) => (s.amount > 0.0001) || (s.rate_per_min > 0.0001));
+ if (stockEntries.length > 0) {
+ const resNames = { food:'🍖 食物', wood:'🪵 木材', metal:'⛏ 金属', gold:'💰 金币', culture:'🏛 文化', research:'🔬 科研', defense:'🛡 防御', military:'⚔ 军事', pop:'👥 人口', population:'👥 人口', water:'💧 水', meat:'🥩 肉', milk:'🥛 奶', coin:'🪙 硬币', flour:'🌾 面粉', prestige:'⭐ 声望', rare:'💎 稀有' };
+ const order = ['food','water','wood','meat','milk','metal','gold','coin','culture','research','defense','military','pop','prestige','rare'];
+ stockEntries.sort((a, b) => {
+ const ia = order.indexOf(a[0]), ib = order.indexOf(b[0]);
+ return (ia < 0 ? 99 : ia) - (ib < 0 ? 99 : ib);
+ });
+ resDiv.innerHTML = stockEntries.map(([k, s]) => `
+ ${resNames[k] || k}
+
`).join('');
+ } else {
+ resDiv.innerHTML = '
+ ${Math.floor(s.amount)}
+ +${fmtNum(s.rate_per_min)}/分
+
+ 暂无资源
';
+ }
const popDiv = document.getElementById('detailPopulation');
if (microState.units.length > 0) {
@@ -3533,6 +3649,7 @@ function startMicroRender() {
const dt = Math.min((now - (loop._last || now)) / 1000, 0.05);
loop._last = now;
microState.animTime += dt;
+ microCollectHints.length = 0; // 每帧重建可回收徽标命中表
const mW = microCanvas.width, mH = microCanvas.height;
const terrain = TERRAIN[microState.tile.terrain];
@@ -3635,6 +3752,14 @@ function startMicroRender() {
// 玩家仍可通过 hover 看到白+橙色高亮框，建造预览时也有绿/红合法性外框。
microDrawPlaced(microCtx, b, it, g.cell, ew, eh);
microCtx.restore();
+ // 建筑囤积提示徽标（离线产出，可点击回收）
+ const mInst = microInstanceCache[b.i + ',' + b.j];
+ if (mInst && mInst.stored && Object.values(mInst.stored).some(v => v > 0.0001)) {
+ const topV = microCellToScreen(b.i, b.j);
+ const bx = topV.x, by = topV.y - 26;
+ microDrawCollectHint(microCtx, bx, by);
+ microCollectHints.push({ x: bx, y: by, i: b.i, j: b.j });
+ }
});
// hover 高亮：把微高亮的建筑额外描一遍醒目 footprint（覆盖在所有建筑之上，不被遮挡）
@@ -4139,8 +4264,12 @@ async function onMicroUp(e) {
microSwipe.active = false;
microCanvas.style.cursor = '';
if (Math.hypot(dx, dy) < MICRO_SWIPE_MIN) {
- // 轻点：命中已放置建筑 → 弹出说明/交互弹窗（非建造模式）
+ // 轻点：先看是否命中"可回收囤积"徽标（优先级最高）
const p = getMicroPoint(e);
+ const wp = screenToWorld(p.x, p.y);
+ const hitHint = microCollectHints.find(h => Math.hypot(wp.x - h.x, wp.y - h.y) <= 18);
+ if (hitHint) { microCollectAt(hitHint.i, hitHint.j); return; }
+ // 命中已放置建筑 → 弹出说明/交互弹窗（非建造模式）
const hit = microBuildingAt(microCellAt(p));
if (hit) {
hideMicroHoverTip();
@@ -4202,6 +4331,7 @@ function setMicroTile(tile) {
updateSidebar();
microAutoRoadCells(); // 切地块时重新计算自动道路贴图
microSanitizeBuildings(); // 切地块时清理越界建筑
+ microRefreshResources(); // 切地块时刷新建筑囤积徽标缓存
}
// 快照旧视图 → 切换地块 → 重建缓存 → 启动滑入过渡
function transitionMicroTo(tile, dx, dy) {
@@ -5695,6 +5825,8 @@ function exitMicroWorld() {
document.getElementById('microView').classList.remove('active');
if (microAnimId) { cancelAnimationFrame(microAnimId); microAnimId = null; }
if (typeof saveMicroCharsNow === 'function') saveMicroCharsNow(); // 退出前落库角色（删除/移动）
+ if (microResourceTimer) { clearInterval(microResourceTimer); microResourceTimer = null; }
+ microStockCache = {}; microInstanceCache = {}; microCollectHints = [];
microState = null;
microGridCache = null;
microBuildRevealAt = 0;
@@ -6449,6 +6581,9 @@ async function flushBuildSave() {
} else {
microToast('建造未保存：连不上后端（确认 Odoo 已启动、经 localhost:8080 访问）');
}
+ } else {
+ // 后端已同步建筑实例并更新速率，立即刷新右侧面板
+ await microRefreshResources();
}
}