diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes
index 47c67028a..f069aaff0 100644
Binary files a/Assets/Resources/Fgui/Common/Common_fui.bytes and b/Assets/Resources/Fgui/Common/Common_fui.bytes differ
diff --git a/Assets/Scripts/UI/Common/Items/NoticeItem.cs b/Assets/Scripts/UI/Common/Items/NoticeItem.cs
index 36c0b63d6..1088adff0 100644
--- a/Assets/Scripts/UI/Common/Items/NoticeItem.cs
+++ b/Assets/Scripts/UI/Common/Items/NoticeItem.cs
@@ -15,6 +15,7 @@ namespace NBF
public void SetData(string message, Notices.NoticeType noticeType)
{
style.selectedIndex = (int)noticeType;
+ TextContent.text = message;
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs b/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs
index b54a3d604..582ed4d0a 100644
--- a/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs
+++ b/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs
@@ -207,9 +207,8 @@ namespace NBF
{
if (_rotating != Vector3.zero && this.modelRoot != null)
{
- Vector3 localRotation = modelRoot.localRotation.eulerAngles;
- localRotation += _rotating;
- modelRoot.localRotation = Quaternion.Euler(localRotation);
+ // 使用 Quaternion 来避免欧拉角带来的问题
+ modelRoot.Rotate(_rotating, Space.World);
}
SetLayer(_root.gameObject, RENDER_LAYER);
diff --git a/FGUIProject/assets/Common/Com/Tags/NoticeItem.xml b/FGUIProject/assets/Common/Com/Tags/NoticeItem.xml
index 9a6e6f20e..b65b92bb2 100644
--- a/FGUIProject/assets/Common/Com/Tags/NoticeItem.xml
+++ b/FGUIProject/assets/Common/Com/Tags/NoticeItem.xml
@@ -7,12 +7,14 @@
-
+
-
+
-
+
+
+