Merge branch 'develop' into feature/spritegroup

Assets/Scripts/Dialog System/BaseYarnCommand.cs

@@ -72,6 +72,18 @@ namespace AibisDream
         {
             return MainUIController.Instance.HideObj();
         }
+        
+        [YarnCommand("show_full_screen")]
+        public static IEnumerator ShowFullScreen(string picName)
+        {
+            return MainUIController.Instance.ShowFullScreen(picName);
+        }
+
+        [YarnCommand("hide_full_screen")]
+        public static IEnumerator HideFullScreen()
+        {
+            return MainUIController.Instance.HideFullScreen();
+        }
 
         [YarnCommand("switch_dialog_viewer")]
         public static void SwitchDialogViewer(string viewerTypeStr)

Assets/Scripts/UI/MainUIViewer.cs

@@ -28,6 +28,7 @@ namespace AibisDream
         private FadeImage _news;
         private GameObject _objPanel;
         private Image _objImage;
+        private Image _fullScreen;
 
         #endregion
 
@@ -131,6 +132,22 @@ namespace AibisDream
             _objImage.gameObject.SetActive(true);
             yield return _objImage.DOBlendableColor(Color.white, 1).WaitForCompletion();
         }
+
+        public IEnumerator ShowFullScreen(string picName)
+        {
+            _fullScreen.sprite = Resources.Load<Sprite>($"Art/Obj/{picName}");
+            
+            // 淡入
+            _fullScreen.gameObject.SetActive(true);
+            yield return _objImage.DOBlendableColor(Color.white, 1).WaitForCompletion();
+        }
+
+        public IEnumerator HideFullScreen()
+        {
+            _fullScreen.gameObject.SetActive(true);
+            yield return _objImage.DOBlendableColor(Color.clear, 1).WaitForCompletion();
+            _fullScreen.gameObject.SetActive(false);
+        }
         
         /// <summary>
         /// 隐藏物体
@@ -157,6 +174,8 @@ namespace AibisDream
 
             _objPanel = transform.Find(ObjPanel).gameObject;
             _objImage = _objPanel.transform.GetChild(0).GetComponent<Image>();
+
+            _fullScreen = transform.Find("Full Screen Image").GetComponent<Image>();
         }
     }
 }