From edc8f5525faee13f751684f1f260d11b7f823a08 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sat, 8 Mar 2025 21:33:29 +0800 Subject: [PATCH] Update YarnUtil.cs --- Assets/Scripts/Utility/YarnUtil.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Assets/Scripts/Utility/YarnUtil.cs b/Assets/Scripts/Utility/YarnUtil.cs index 4a6a3ea13..aaaedda0b 100644 --- a/Assets/Scripts/Utility/YarnUtil.cs +++ b/Assets/Scripts/Utility/YarnUtil.cs @@ -35,16 +35,13 @@ namespace AibisDream.Utility // 直接写就使用配置选项 if (characterAttribute.Properties.TryGetValue("name", out var nameValue)) { - return GetCharacterVoByKey(nameValue.StringValue); - } - - // 带key就说明可能有自定义属性 - if (characterAttribute.Properties.TryGetValue("key", out var keyValue)) - { - // 先从配置文件找 - var charVo = GetCharacterVoByKey(keyValue.StringValue); - // 再用自定义填充 - return FullCharVoWithProps(charVo, characterAttribute.Properties); + var charVo = GetCharacterVoByKey(nameValue.StringValue); + if (characterAttribute.Properties.Count > 1) + { + charVo = FullCharVoWithProps(charVo, characterAttribute.Properties); + } + + return charVo; } // 找不到Name和Key