diff --git a/Assets/Resources/UIs/PanelGame.prefab b/Assets/Resources/UIs/PanelGame.prefab index 8494495a..9bb226ef 100644 --- a/Assets/Resources/UIs/PanelGame.prefab +++ b/Assets/Resources/UIs/PanelGame.prefab @@ -886,8 +886,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1836093680867636031} + - component: {fileID: 6286447948450706631} m_Layer: 5 - m_Name: Gob_Content + m_Name: Cvs_Content m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -915,6 +916,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &6286447948450706631 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836093680867636030} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1836093681331976744 GameObject: m_ObjectHideFlags: 0 @@ -1037,6 +1050,7 @@ GameObject: - component: {fileID: 1836093682215310855} - component: {fileID: 1836093682215310857} - component: {fileID: 1836093682215310856} + - component: {fileID: 6286447948450706633} m_Layer: 5 m_Name: Img_Bg m_TagString: Untagged @@ -1101,6 +1115,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &6286447948450706633 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836093682215310854} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1836093682229561510 GameObject: m_ObjectHideFlags: 0 @@ -1339,11 +1365,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 83cdb8e09db29419ea6c178936166618, type: 3} m_Name: m_EditorClassIdentifier: - mImgBg: {fileID: 1836093682215310856} mRctTopFrame: {fileID: 1836093681331976745} mRctBottomFrame: {fileID: 1836093682229561511} mRctTitleBg: {fileID: 1836093682745290907} - mGobContent: {fileID: 1836093680867636030} + mCvsBg: {fileID: 6286447948450706633} + mCvsContent: {fileID: 6286447948450706631} + mImgBg: {fileID: 1836093682215310856} mTxtTitle: {fileID: 6286447948274353892} mImgLogo: {fileID: 1836093682264656332} mImgIcon: {fileID: 6286447949522514435} diff --git a/Assets/Scripts/UI/CustomControl/LevelOpening.cs b/Assets/Scripts/UI/CustomControl/LevelOpening.cs index 69adf9ee..3ceadb01 100644 --- a/Assets/Scripts/UI/CustomControl/LevelOpening.cs +++ b/Assets/Scripts/UI/CustomControl/LevelOpening.cs @@ -7,14 +7,15 @@ using DG.Tweening; public class LevelOpening : MonoBehaviour { - [SerializeField] Image mImgBg; - [SerializeField] RectTransform mRctTopFrame; [SerializeField] RectTransform mRctBottomFrame; [SerializeField] RectTransform mRctTitleBg; - [SerializeField] GameObject mGobContent; + [SerializeField] CanvasGroup mCvsBg; + [SerializeField] CanvasGroup mCvsContent; + + [SerializeField] Image mImgBg; [SerializeField] Text mTxtTitle; [SerializeField] Image mImgLogo; [SerializeField] Image mImgIcon; @@ -38,11 +39,11 @@ public class LevelOpening : MonoBehaviour mImgIcon.sprite = ResourceManager.Instance.LoadRes(Const.Path.GetLevelIconSmall(tLevelID)); //animation - mImgBg.gameObject.SetActive(true); mRctTopFrame.anchoredPosition = new Vector2(0, 850); mRctBottomFrame.anchoredPosition = new Vector2(0, -760); - mGobContent.SetActive(true); + mCvsBg.alpha = 1; + mCvsContent.alpha = 1; mRctTitleBg.localScale = new Vector3(1, 0, 1); mImgLogo.rectTransform.anchoredPosition = new Vector2(600, 0); mImgIcon.rectTransform.localScale = Vector3.zero; @@ -57,15 +58,15 @@ public class LevelOpening : MonoBehaviour tAniSequence.Join(mImgIcon.rectTransform.DOScale(Vector3.one, 0.3f).SetEase(Ease.OutBack).SetDelay(0.2f)); tAniSequence.AppendInterval(0.8f); tAniSequence.AppendCallback(Exit); - tAniSequence.Append(mRctTopFrame.DOAnchorPosY(850, 0.5f)); + tAniSequence.Append(mCvsBg.DOFade(0, 0.3f)); + tAniSequence.Join(mCvsContent.DOFade(0, 0.3f)); + tAniSequence.Join(mRctTopFrame.DOAnchorPosY(850, 0.5f)); tAniSequence.Join(mRctBottomFrame.DOAnchorPosY(-760, 0.5f)); tAniSequence.AppendCallback(Over); } private void Exit() { - mImgBg.gameObject.SetActive(false); - mGobContent.SetActive(false); mDelExit?.Invoke(); }