Răsfoiți Sursa

修改通用弹窗动画

leiyasi 1 an în urmă
părinte
comite
50690c4d90

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardDetailUI.cs

@@ -13,6 +13,8 @@ namespace UI.Card
         public GList m_listRole;
         public GList m_listCard;
         public GTextField m_txtTips;
+        public Transition m_In;
+        public Transition m_Refresh;
         public const string URL = "ui://7l6lvkayojlz4";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "CardDetailUI";
@@ -66,6 +68,8 @@ namespace UI.Card
             m_listRole = (GList)comp.GetChild("listRole");
             m_listCard = (GList)comp.GetChild("listCard");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_In = comp.GetTransition("In");
+            m_Refresh = comp.GetTransition("Refresh");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +79,8 @@ namespace UI.Card
             m_listRole = null;
             m_listCard = null;
             m_txtTips = null;
+            m_In = null;
+            m_Refresh = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideDetailUI.cs

@@ -14,6 +14,7 @@ namespace UI.FieldGuide
         public GButton m_btnSearch;
         public UI_ProgressBar4 m_progress;
         public Transition m_In;
+        public Transition m_Refresh;
         public const string URL = "ui://vqq9h9h4e3ot6l";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "SuitGuideDetailUI";
@@ -68,6 +69,7 @@ namespace UI.FieldGuide
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_progress = (UI_ProgressBar4)UI_ProgressBar4.Create(comp.GetChild("progress"));
             m_In = comp.GetTransition("In");
+            m_Refresh = comp.GetTransition("Refresh");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,6 +81,7 @@ namespace UI.FieldGuide
             m_progress.Dispose();
             m_progress = null;
             m_In = null;
+            m_Refresh = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 24 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -11,6 +11,8 @@ namespace GFGGame
     {
         private UI_CardDetailUI _ui;
         private const int listRoleCount = 5;
+        private bool _startInAnim;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -44,11 +46,12 @@ namespace GFGGame
             // {
             //     UpdateCardList(_ui.m_listRole.selectedIndex);
             // });
+            _startInAnim = true;
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.CARD_FILTER, UpdateCardList);
+            EventAgent.AddEventListener(ConstMessage.CARD_FILTER, FilterItems);
             EventAgent.AddEventListener(ConstMessage.CARD_INFO, UpdateCardList);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateCardList);
         }
@@ -64,6 +67,13 @@ namespace GFGGame
             this.UpdateCardList();
 
             Timers.inst.AddUpdate(CheckGuide);
+
+            if (_startInAnim)
+            {
+                _startInAnim = false;
+                _ui.m_listCard.scrollPane.ScrollTop();
+                _ui.m_In.Play();
+            }
         }
         protected override void OnHide()
         {
@@ -74,10 +84,18 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.CARD_FILTER, UpdateCardList);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_FILTER, FilterItems);
             EventAgent.RemoveEventListener(ConstMessage.CARD_INFO, UpdateCardList);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateCardList);
         }
+
+        private void FilterItems()
+        {
+            _ui.m_Refresh.Play();
+            _ui.m_listCard.scrollPane.ScrollTop();
+            UpdateCardList();
+        }
+
         private void UpdateCardList()
         {
             List<CardData> cardList = CardDataManager.GetCardListByRoleType(_ui.m_listRole.selectedIndex);
@@ -137,6 +155,9 @@ namespace GFGGame
             _ui.m_listRole.selectedIndex = index;
 
             this.UpdateCardList();
+
+            _ui.m_listCard.scrollPane.ScrollTop();
+            _ui.m_Refresh.Play();
         }
 
         /*******************************************************监听函数**************************************************/
@@ -147,6 +168,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(ViewName.CARD_DETAIL_VIEW);
+            _startInAnim = true;
         }
 
         private void OnClickBtnHome()

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -33,6 +33,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             approachView = new ApproachView();
             approachView.OnInit(_ui.m_comTipsApproach.target);

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -321,6 +321,7 @@ namespace GFGGame
             }
             ViewManager.Hide<ModalStatusView>();
             UpdateItemList(false);
+            _ui.m_Refresh.Play();
         }
 
     }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -92,6 +92,7 @@ namespace GFGGame
 
             ViewManager.Hide<ModalStatusView>();
             _ui.m_listSuit.numItems = _suitIds.Count;
+            _ui.m_Refresh.Play();
 
         }
 

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/ViewAnimationFactory.cs

@@ -21,12 +21,13 @@ namespace GFGGame
             else
             {
                 gComponent.visible = false;
-                gComponent.SetScale(0.4f, 0.4f);
+                gComponent.SetScale(0.7f, 0.7f);
                 gComponent.SetPivot(0.5f, 0.5f);
-                gComponent.TweenFade(0, 0).OnComplete(() =>
+                gComponent.TweenFade(0f, 0).OnComplete(() =>
                 {
                     gComponent.visible = true;
-                    gComponent.TweenFade(1, 0.3f);
+                    
+                    gComponent.TweenFade(1, 0.3f).SetEase(EaseType.QuadOut);
                     gComponent.TweenScale(new Vector2(1, 1), 0.3f).SetEase(EaseType.BackOut).OnComplete(callback);
                 });
             }

BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes