已把工具调用从 XML 改成 OpenAI 兼容 JSON,并统一解析/执行流程。改动概览如下:
新增 JSON tool_calls 解析/序列化并替换核心执行与提示词为 JSON-only:JsonToolCallParser.cs、AIIntelligenceCore.cs 工具基类移除 XML 解析,统一 JSON 参数读取与类型转换辅助:AITool.cs 工具实现统一 JSON args/UsageSchema(含重写/修复):Tool_ModifyGoodwill.cs、Tool_SendReinforcement.cs、Tool_GetMapPawns.cs、Tool_GetMapResources.cs、Tool_GetAvailablePrefabs.cs、Tool_CallPrefabAirdrop.cs、Tool_CallBombardment.cs、Tool_GetAvailableBombardments.cs、Tool_GetPawnStatus.cs、Tool_GetRecentNotifications.cs、Tool_SearchThingDef.cs、Tool_SearchPawnKind.cs、Tool_ChangeExpression.cs、Tool_SetOverwatchMode.cs、Tool_RememberFact.cs、Tool_RecallMemories.cs、Tool_SpawnResources.cs、Tool_AnalyzeScreen.cs 轰炸相关解析统一到 JSON 字典并增强数值解析:BombardmentUtility.cs UI 对话展示改为剥离 JSON tool_calls:Overlay_WulaLink.cs、Dialog_AIConversation.cs
This commit is contained in:
@@ -10,18 +10,18 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
|
||||
{
|
||||
public override string Name => "search_pawn_kind";
|
||||
public override string Description => "Rough-searches PawnKindDefs by natural language (label/defName). Returns candidate defNames for send_reinforcement.";
|
||||
public override string UsageSchema => "<search_pawn_kind><query>string</query><maxResults>int (optional, default 10)</maxResults><minScore>float (optional, default 0.15)</minScore></search_pawn_kind>";
|
||||
public override string UsageSchema => "{\"query\":\"escort\",\"maxResults\":10,\"minScore\":0.15}";
|
||||
|
||||
public override string Execute(string args)
|
||||
{
|
||||
try
|
||||
{
|
||||
var parsed = ParseXmlArgs(args);
|
||||
var parsed = ParseJsonArgs(args);
|
||||
string query = null;
|
||||
if (parsed.TryGetValue("query", out string q)) query = q;
|
||||
if (TryGetString(parsed, "query", out string q)) query = q;
|
||||
if (string.IsNullOrWhiteSpace(query))
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(args) && !args.Trim().StartsWith("<"))
|
||||
if (!string.IsNullOrWhiteSpace(args) && !LooksLikeJson(args))
|
||||
{
|
||||
query = args;
|
||||
}
|
||||
@@ -33,16 +33,10 @@ namespace WulaFallenEmpire.EventSystem.AI.Tools
|
||||
}
|
||||
|
||||
int maxResults = 10;
|
||||
if (parsed.TryGetValue("maxResults", out string maxStr) && int.TryParse(maxStr, out int mr))
|
||||
{
|
||||
maxResults = Math.Max(1, Math.Min(50, mr));
|
||||
}
|
||||
if (TryGetInt(parsed, "maxResults", out int mr)) maxResults = Math.Max(1, Math.Min(50, mr));
|
||||
|
||||
float minScore = 0.15f;
|
||||
if (parsed.TryGetValue("minScore", out string minStr) && float.TryParse(minStr, out float ms))
|
||||
{
|
||||
minScore = Math.Max(0.01f, Math.Min(1.0f, ms));
|
||||
}
|
||||
if (TryGetFloat(parsed, "minScore", out float ms)) minScore = Math.Max(0.01f, Math.Min(1.0f, ms));
|
||||
|
||||
var candidates = PawnKindDefSearcher.Search(query, maxResults: maxResults, minScore: minScore);
|
||||
if (candidates.Count == 0)
|
||||
|
||||
Reference in New Issue
Block a user