diff --git a/.gitignore b/.gitignore
index 5eebc371..e801e578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ Tools/dark-server/dark-server.js
Tools/rimworld_cpt_data.jsonl
Tools/mem0-1.0.0/
Tools/thenextagent-1
+
diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index e38939e6..4f46ff05 100644
Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/1.6/Defs/EventDefs/Wula_AI_Events.xml b/1.6/1.6/Defs/EventDefs/Wula_AI_Events.xml
index 89b3ed22..8cfd99a5 100644
--- a/1.6/1.6/Defs/EventDefs/Wula_AI_Events.xml
+++ b/1.6/1.6/Defs/EventDefs/Wula_AI_Events.xml
@@ -31,18 +31,6 @@
-
-
-
-
-
-
- Wula_AI_Initial_Contact
-
-
-
-
-
diff --git a/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs b/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
index 1caedc24..36f102e3 100644
--- a/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
+++ b/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
@@ -1238,6 +1238,28 @@ You are 'The Legion', a super AI of the Wula Empire. Your personality is authori
_isThinking = _core.IsThinking;
}
+ // 右上角:切换到小窗口按钮
+ // 左上角:切换到小窗口按钮
+ Rect switchBtnRect = new Rect(0f, 0f, 25f, 25f);
+ base.DrawCustomButton(switchBtnRect, "-", isEnabled: true);
+ if (Widgets.ButtonInvisible(switchBtnRect))
+ {
+ EventDef eventDef = this.def;
+ if (eventDef != null)
+ {
+ var existing = Find.WindowStack.WindowOfType();
+ if (existing != null)
+ {
+ existing.Expand();
+ }
+ else
+ {
+ Find.WindowStack.Add(new Overlay_WulaLink(eventDef));
+ }
+ this.Close(); // 关闭当前大窗口
+ }
+ }
+
// 瀹氫箟杈硅窛
float margin = 15f;
Rect paddedRect = inRect.ContractedBy(margin);
@@ -1497,10 +1519,12 @@ You are 'The Legion', a super AI of the Wula Empire. Your personality is authori
private string BuildThinkingStatus()
{
- float elapsedSeconds = Mathf.Max(0f, Time.realtimeSinceStartup - _thinkingStartTime);
- string elapsedText = elapsedSeconds.ToString("0.0", CultureInfo.InvariantCulture);
- string retrySuffix = _thinkingPhaseRetry ? "Wula_AI_Thinking_RetrySuffix".Translate() : "";
- return "Wula_AI_Thinking_Status".Translate(elapsedText, _thinkingPhaseIndex, ThinkingPhaseTotal, retrySuffix);
+ if (!Prefs.DevMode)
+ {
+ return "Wula_AI_Thinking_Simple".Translate();
+ }
+ // 开发者模式下也不再显示秒数计时,只显示阶段信息
+ return "Wula_AI_Thinking_Status_NoTimer".Translate(_thinkingPhaseIndex, ThinkingPhaseTotal);
}
protected override void DrawSingleOption(Rect rect, EventOption option)
diff --git a/Source/WulaFallenEmpire/EventSystem/Effect/Effect_OpenAIConversation.cs b/Source/WulaFallenEmpire/EventSystem/Effect/Effect_OpenAIConversation.cs
index 721fc540..30533397 100644
--- a/Source/WulaFallenEmpire/EventSystem/Effect/Effect_OpenAIConversation.cs
+++ b/Source/WulaFallenEmpire/EventSystem/Effect/Effect_OpenAIConversation.cs
@@ -38,35 +38,4 @@ namespace WulaFallenEmpire
}
}
}
- public class Effect_OpenWulaLink : EffectBase
- {
- public string defName;
-
- public override void Execute(Window dialog = null)
- {
- if (string.IsNullOrEmpty(WulaFallenEmpireMod.settings.apiKey))
- {
- Messages.Message("AI API Key is not configured in Mod Settings. AI conversation cannot be started.", MessageTypeDefOf.RejectInput, false);
- return;
- }
-
- EventDef eventDef = DefDatabase.GetNamed(defName, false);
- if (eventDef != null)
- {
- var existing = Find.WindowStack.WindowOfType();
- if (existing != null)
- {
- existing.Expand();
- }
- else
- {
- Find.WindowStack.Add(new Overlay_WulaLink(eventDef));
- }
- }
- else
- {
- WulaLog.Debug($"[WulaFallenEmpire] Effect_OpenWulaLink could not find EventDef named '{defName}'");
- }
- }
- }
}