diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll index b0df8b6..ef6ef20 100644 Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.pdb b/1.6/1.6/Assemblies/ArachnaeSwarm.pdb index 5fd76ef..f966b8d 100644 Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.pdb and b/1.6/1.6/Assemblies/ArachnaeSwarm.pdb differ diff --git a/Source/ArachnaeSwarm/Buildings/Building_Ootheca/Gizmo_IncubationProgress.cs b/Source/ArachnaeSwarm/Buildings/Building_Ootheca/Gizmo_IncubationProgress.cs index 039aa95..ba13d53 100644 --- a/Source/ArachnaeSwarm/Buildings/Building_Ootheca/Gizmo_IncubationProgress.cs +++ b/Source/ArachnaeSwarm/Buildings/Building_Ootheca/Gizmo_IncubationProgress.cs @@ -189,36 +189,46 @@ namespace ArachnaeSwarm private string GetTooltip() { var sb = new System.Text.StringBuilder(); + bool isIncubating = ootheca.isIncubating; - // 孵化目标 - if (ootheca.incubatingPawnKind != null) - { - sb.AppendLine("正在孵化: " + ootheca.incubatingPawnKind.LabelCap); - } - - // 进度信息 - sb.AppendLine(); - sb.AppendLine("孵化进度: " + ootheca.AdjustedProgressPercent.ToStringPercent()); - sb.AppendLine("品质进度: " + ootheca.QualityPercent.ToStringPercent()); - - // 剩余时间 - float daysRemaining = ootheca.GetRemainingDays(); - if (daysRemaining > 0 && daysRemaining < float.MaxValue) + if (isIncubating && ootheca.incubatingPawnKind != null) { + // 孵化中状态 + sb.AppendLine("【孵化中】"); + sb.AppendLine("目标: " + ootheca.incubatingPawnKind.LabelCap); + sb.AppendLine("孵化进度: " + ootheca.AdjustedProgressPercent.ToStringPercent()); + sb.AppendLine("品质进度: " + ootheca.QualityPercent.ToStringPercent()); + + float daysRemaining = ootheca.GetRemainingDays(); + if (daysRemaining > 0 && daysRemaining < float.MaxValue) + { + sb.AppendLine("剩余时间: " + daysRemaining.ToString("F1") + " 天"); + } + sb.AppendLine(); - sb.AppendLine("剩余时间: " + daysRemaining.ToString("F1") + " 天"); + sb.AppendLine("速度: " + ootheca.SpeedMultiplier.ToStringPercent()); + sb.AppendLine("质量: " + ootheca.QualityMultiplier.ToStringPercent()); + } + else + { + // 空闲状态 + var config = ootheca.IncubatorData?.SelectedConfig; + if (config != null) + { + sb.AppendLine("【就绪】"); + sb.AppendLine("目标: " + config.pawnKind.LabelCap); + sb.AppendLine("孵化时间: " + config.daysRequired + " 天"); + } + else + { + sb.AppendLine("【未选择目标】"); + sb.AppendLine("点击上方标题选择孵化目标"); + } + + sb.AppendLine(); + sb.AppendLine("当前速度加成: " + ootheca.SpeedMultiplier.ToStringPercent()); + sb.AppendLine("当前质量加成: " + ootheca.QualityMultiplier.ToStringPercent()); } - - // 速度和质量乘数 - sb.AppendLine(); - sb.AppendLine("速度倍率: " + ootheca.SpeedMultiplier.ToStringPercent()); - sb.AppendLine("质量倍率: " + ootheca.QualityMultiplier.ToStringPercent()); - - // 详细因子 - sb.AppendLine(); - sb.AppendLine(ootheca.GetSpeedFactorsDescription()); - sb.AppendLine(); - sb.AppendLine(ootheca.GetQualityFactorsDescription()); return sb.ToString().TrimEndNewlines(); }