From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Message/ImgAnalysis.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/Main/System/Message/ImgAnalysis.cs b/Main/System/Message/ImgAnalysis.cs
index 8923bb5..05c8164 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);
@@ -177,9 +182,9 @@
private void InverseToRichText()
{
m_StringBuilder.Append("<color=#00000000><quad ");
- m_StringBuilder.Append(string.Format("size={0} ", presentImgInfo.height* presentImgInfo.scale));
- float ratio = (float)Math.Round((float)presentImgInfo.width / presentImgInfo.height * presentImgInfo.scale, 1);
- m_StringBuilder.Append(string.Format("width={0} ", ratio));
+ m_StringBuilder.Append(string.Format("size={0} ", presentImgInfo.height)); // 鍗犱綅鍍忕礌
+ float ratio = 1f;
+ m_StringBuilder.Append(string.Format("width={0} ", ratio)); //鍩虹size鐨勭缉鏀炬瘮鐜�
m_StringBuilder.Append(string.Format("index={0}", presentImgInfo.index));
m_StringBuilder.Append("/></color>");
}
@@ -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)
@@ -209,8 +221,11 @@
return;
}
}
- presentImgInfo.width = presentImgInfo.sprite.rect.width * presentImgInfo.scale;
- presentImgInfo.height = presentImgInfo.sprite.rect.height * presentImgInfo.scale;
+ if (presentImgInfo.scale != 1f)
+ {
+ presentImgInfo.width = presentImgInfo.sprite.rect.width * presentImgInfo.scale;
+ presentImgInfo.height = presentImgInfo.sprite.rect.height * presentImgInfo.scale;
+ }
}
}
--
Gitblit v1.8.0