From bb463ef0b13236738a1da9cd04f57def3e7e2c7c Mon Sep 17 00:00:00 2001 From: yyl <yyl> Date: 星期五, 29 八月 2025 15:21:51 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts --- Main/System/Message/ImgAnalysis.cs | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Main/System/Message/ImgAnalysis.cs b/Main/System/Message/ImgAnalysis.cs index 5d6e268..bd82e5b 100644 --- a/Main/System/Message/ImgAnalysis.cs +++ b/Main/System/Message/ImgAnalysis.cs @@ -131,6 +131,11 @@ presentImgInfo.spriteName = array[1]; } break; + case "folder": + { + presentImgInfo.folderName = array[1]; + } + break; case "face": { presentImgInfo.spriteName = array[1]; @@ -143,7 +148,7 @@ height = (int)RichTextMgr.Inst.presentRichText.FaceSize; } else - { + { if (UIFrameMgr.Inst.ContainsDynamicImage(presentImgInfo.spriteName)) { var list = UIFrameMgr.Inst.GetDynamicImage(presentImgInfo.spriteName); @@ -189,7 +194,14 @@ if (presentImgInfo.IsFace) return; if (IconConfig.isInit) { - presentImgInfo.sprite = UILoader.LoadSprite(presentImgInfo.spriteName); + if (!string.IsNullOrEmpty(presentImgInfo.folderName)) + { + presentImgInfo.sprite = UILoader.LoadSprite(presentImgInfo.folderName, presentImgInfo.spriteName); + } + else + { + presentImgInfo.sprite = UILoader.LoadSprite(presentImgInfo.spriteName); + } } if (presentImgInfo.sprite != null) -- Gitblit v1.8.0