ProjectKoi-Kalo\Kalo
98a0400c78
✅ WulaLog.cs - 修改了DebugEnabled属性，仅检查enableDebugLogs设置（不检查DevMode） ✅ WulaFallenEmpireMod.cs - 在DoSettingsWindowContents中添加了UI复选框，显示"Enable Debug Logs"选项 ✅ 替换了所有848个Log.Message/Error/Warning调用为WulaLog.Debug()
257 lines
9.8 KiB
C#
257 lines
9.8 KiB
C#
using RimWorld;
|
||
using System.Collections.Generic;
|
||
using Verse;
|
||
using UnityEngine;
|
||
|
||
namespace WulaFallenEmpire
|
||
{
|
||
public class GlobalProductionOrderStack : IExposable
|
||
{
|
||
public Building_GlobalWorkTable table;
|
||
public List<GlobalProductionOrder> orders = new List<GlobalProductionOrder>();
|
||
|
||
// 修复：明确的工作量定义
|
||
private const float WorkPerSecond = 60f; // 每秒60工作量（标准RimWorld速度）
|
||
private const float TicksPerSecond = 60f;
|
||
private int lastProcessedTick = -1;
|
||
|
||
public GlobalProductionOrderStack(Building_GlobalWorkTable table)
|
||
{
|
||
this.table = table;
|
||
}
|
||
|
||
public void ExposeData()
|
||
{
|
||
Scribe_References.Look(ref table, "table");
|
||
Scribe_Collections.Look(ref orders, "orders", LookMode.Deep);
|
||
|
||
// 修复：加载后验证和修复数据
|
||
if (Scribe.mode == LoadSaveMode.PostLoadInit)
|
||
{
|
||
FixAllOrders();
|
||
}
|
||
}
|
||
|
||
public void AddOrder(GlobalProductionOrder order)
|
||
{
|
||
orders.Add(order);
|
||
|
||
var globalStorage = Find.World.GetComponent<GlobalStorageWorldComponent>();
|
||
if (globalStorage != null)
|
||
{
|
||
globalStorage.AddProductionOrder(order);
|
||
}
|
||
}
|
||
|
||
public void Delete(GlobalProductionOrder order)
|
||
{
|
||
orders.Remove(order);
|
||
|
||
var globalStorage = Find.World.GetComponent<GlobalStorageWorldComponent>();
|
||
if (globalStorage != null)
|
||
{
|
||
globalStorage.RemoveProductionOrder(order);
|
||
}
|
||
}
|
||
|
||
public void ProcessOrders()
|
||
{
|
||
int currentTick = Find.TickManager.TicksGame;
|
||
int deltaTicks = lastProcessedTick < 0 ? 1 : currentTick - lastProcessedTick;
|
||
if (deltaTicks <= 0) deltaTicks = 1;
|
||
lastProcessedTick = currentTick;
|
||
|
||
float workThisStep = WorkPerSecond * (deltaTicks / TicksPerSecond);
|
||
|
||
// 修复：使用倒序遍历避免修改集合问题
|
||
for (int i = orders.Count - 1; i >= 0; i--)
|
||
{
|
||
var order = orders[i];
|
||
|
||
// 首先更新状态
|
||
order.UpdateState();
|
||
|
||
if (order.paused || order.state == GlobalProductionOrder.ProductionState.Completed)
|
||
continue;
|
||
|
||
// 生产中
|
||
if (order.state == GlobalProductionOrder.ProductionState.Producing)
|
||
{
|
||
ProcessProducingOrder(order, i, workThisStep);
|
||
}
|
||
else if (order.state == GlobalProductionOrder.ProductionState.Gathering && !order.paused)
|
||
{
|
||
ProcessWaitingOrder(order);
|
||
}
|
||
}
|
||
}
|
||
|
||
private void ProcessProducingOrder(GlobalProductionOrder order, int index, float workThisStep)
|
||
{
|
||
// 修复：使用正确的方法获取工作量
|
||
float workAmount = GetWorkAmountForOrder(order);
|
||
|
||
// 防止除零错误
|
||
if (workAmount <= 0)
|
||
{
|
||
WulaLog.Debug($"Invalid workAmount ({workAmount}) for recipe {order.recipe.defName}");
|
||
order.state = GlobalProductionOrder.ProductionState.Gathering;
|
||
order.progress = 0f;
|
||
return;
|
||
}
|
||
|
||
// 修复：按两次 ProcessOrders 调用间隔的 tick 计算，避免调用频率变化导致生产速度偏差
|
||
float progressIncrement = workThisStep / workAmount;
|
||
|
||
// 修复：确保进度不会变成负数
|
||
float newProgress = Mathf.Max(0f, order.progress + progressIncrement);
|
||
order.progress = newProgress;
|
||
|
||
// 调试信息
|
||
if (Find.TickManager.TicksGame % 300 == 0) // 每5秒输出一次
|
||
{
|
||
WulaLog.Debug($"[DEBUG] Order {order.recipe.defName}: " +
|
||
$"progress={order.progress:P2}, " +
|
||
$"workAmount={workAmount}, " +
|
||
$"increment={progressIncrement:E4}, " +
|
||
$"state={order.state}");
|
||
}
|
||
|
||
// 修复：使用精确比较完成条件
|
||
if (order.progress >= 1.0f)
|
||
{
|
||
CompleteProduction(order, index);
|
||
}
|
||
}
|
||
|
||
// 修复：新增方法 - 正确获取订单的工作量
|
||
private float GetWorkAmountForOrder(GlobalProductionOrder order)
|
||
{
|
||
if (order?.recipe == null)
|
||
return 1000f; // 默认值
|
||
|
||
// 如果配方有明确的工作量且大于0，使用配方的工作量
|
||
if (order.recipe.workAmount > 0)
|
||
return order.recipe.workAmount;
|
||
|
||
// 否则，使用第一个产品的WorkToMake属性
|
||
if (order.recipe.products != null && order.recipe.products.Count > 0)
|
||
{
|
||
ThingDef productDef = order.recipe.products[0].thingDef;
|
||
if (productDef != null)
|
||
{
|
||
// 获取产品的WorkToMake统计值
|
||
float workToMake = productDef.GetStatValueAbstract(StatDefOf.WorkToMake);
|
||
if (workToMake > 0)
|
||
return workToMake;
|
||
|
||
// 如果WorkToMake也是0或无效，使用产品的市场价值作为估算
|
||
float marketValue = productDef.GetStatValueAbstract(StatDefOf.MarketValue);
|
||
if (marketValue > 0)
|
||
return marketValue * 10f; // 基于市场价值的估算
|
||
}
|
||
}
|
||
|
||
// 最后的回退方案
|
||
WulaLog.Debug($"Could not determine work amount for recipe {order.recipe.defName}, using default value");
|
||
return 1000f; // 默认工作量
|
||
}
|
||
|
||
private void ProcessWaitingOrder(GlobalProductionOrder order)
|
||
{
|
||
// 注意：这里不能在不扣料的情况下把 Gathering 直接切到 Producing（会绕过 TryDeductResources）
|
||
if (order.HasEnoughResources())
|
||
{
|
||
if (order.TryDeductResources())
|
||
{
|
||
order.state = GlobalProductionOrder.ProductionState.Producing;
|
||
order.progress = 0f;
|
||
|
||
if (Find.TickManager.TicksGame % 600 == 0) // 每10秒记录一次
|
||
{
|
||
WulaLog.Debug($"[INFO] Order {order.recipe.defName} started producing");
|
||
}
|
||
}
|
||
else
|
||
{
|
||
WulaLog.Debug($"[WULA] Order {order.recipe.defName} had enough resources but failed to deduct them; staying in Gathering.");
|
||
}
|
||
}
|
||
else if (Find.TickManager.TicksGame % 1200 == 0) // 每20秒检查一次
|
||
{
|
||
WulaLog.Debug($"[DEBUG] Order {order.recipe.defName} is waiting. " +
|
||
$"HasEnoughResources: {order.HasEnoughResources()}");
|
||
}
|
||
}
|
||
|
||
private void CompleteProduction(GlobalProductionOrder order, int index)
|
||
{
|
||
// 生产完成（资源已经在开始生产时扣除）
|
||
order.Produce();
|
||
|
||
WulaLog.Debug($"[SUCCESS] Produced {order.recipe.products[0].thingDef.defName}, " +
|
||
$"count: {order.currentCount}/{order.targetCount}");
|
||
|
||
// 重置进度
|
||
order.progress = 0f;
|
||
|
||
// 检查是否完成所有目标数量
|
||
if (order.currentCount >= order.targetCount)
|
||
{
|
||
order.state = GlobalProductionOrder.ProductionState.Completed;
|
||
Delete(order); // 同步 GlobalStorageWorldComponent.productionOrders
|
||
WulaLog.Debug($"[COMPLETE] Order {order.recipe.defName} completed and removed");
|
||
}
|
||
else
|
||
{
|
||
// 如果还有剩余数量，回到Gathering状态准备下一轮
|
||
order.state = GlobalProductionOrder.ProductionState.Gathering;
|
||
// UpdateState 会自动检查资源并尝试开始下一轮
|
||
order.UpdateState();
|
||
}
|
||
}
|
||
|
||
// 修复：全面数据修复方法
|
||
private void FixAllOrders()
|
||
{
|
||
for (int i = orders.Count - 1; i >= 0; i--)
|
||
{
|
||
var order = orders[i];
|
||
|
||
// 修复进度值
|
||
if (float.IsNaN(order.progress) || float.IsInfinity(order.progress))
|
||
{
|
||
order.progress = 0f;
|
||
WulaLog.Debug($"Fixed invalid progress for {order.recipe?.defName ?? "unknown"}");
|
||
}
|
||
else if (order.progress < 0f)
|
||
{
|
||
order.progress = 0f;
|
||
WulaLog.Debug($"Fixed negative progress for {order.recipe?.defName ?? "unknown"}");
|
||
}
|
||
else if (order.progress > 1f)
|
||
{
|
||
order.progress = 1f;
|
||
WulaLog.Debug($"Fixed excessive progress for {order.recipe?.defName ?? "unknown"}");
|
||
}
|
||
|
||
// 修复状态
|
||
if (order.recipe == null)
|
||
{
|
||
WulaLog.Debug($"Removing order with null recipe");
|
||
Delete(order); // 同步 GlobalStorageWorldComponent.productionOrders
|
||
continue;
|
||
}
|
||
|
||
// 强制更新状态
|
||
order.UpdateState();
|
||
}
|
||
}
|
||
|
||
public void FixNegativeProgress()
|
||
{
|
||
FixAllOrders();
|
||
}
|
||
}
|
||
}
|