Merge branch 'bugfix-showobj更新' into 'develop'

fix(ui): show_obj改进

See merge request aibis-dream/aibis-dream!716
This commit is contained in:
2026-06-29 12:21:11 +00:00
2 changed files with 2 additions and 7 deletions
+2 -2
View File
@@ -14106,14 +14106,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: eccbf2467d281894bafba3ef467f0875, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
-5
View File
@@ -122,7 +122,6 @@ namespace AibisDream.UI
/// <returns>协程</returns>
public IEnumerator ShowObj(string picName, float duration = 1)
{
_showObjImage.color = Color.clear;
_showObjPanel.gameObject.SetActive(true);
var key = string.Format(ObjSpritePath, NormalizeObjPicName(picName));
@@ -163,9 +162,6 @@ namespace AibisDream.UI
public IEnumerator ShowFullScreen(string picName, float duration = 1)
{
_fullScreenImage.color = Color.clear;
_fullScreenImage.gameObject.SetActive(true);
var key = string.Format(ObjSpritePath, NormalizeObjPicName(picName));
var handle = ResourceSystem.LoadAsync<Sprite>(key);
yield return handle;
@@ -184,7 +180,6 @@ namespace AibisDream.UI
public IEnumerator HideFullScreen(float duration = 1)
{
yield return _fullScreenImage.FadeOutAsync(duration);
_fullScreenImage.gameObject.SetActive(false);
}
public IEnumerator OpenProgressWindow(string title, string description, float duration)