Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_MailUI.cs

@@ -16,6 +16,7 @@ namespace UI.Mail
         public GTextField m_txtMaxCount;
         public GButton m_btnDelete;
         public GButton m_btnGet;
+        public Transition m_openViewAction;
         public const string URL = "ui://y44a413eehs9c";
         public const string PACKAGE_NAME = "Mail";
         public const string RES_NAME = "MailUI";
@@ -72,6 +73,7 @@ namespace UI.Mail
             m_txtMaxCount = (GTextField)comp.GetChild("txtMaxCount");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_openViewAction = comp.GetTransition("openViewAction");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +86,7 @@ namespace UI.Mail
             m_txtMaxCount = null;
             m_btnDelete = null;
             m_btnGet = null;
+            m_openViewAction = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -929,8 +929,8 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnUpLv, RedDotDataManager.Instance.GetCardUpLvRed(_cardData.id), "", -74, 60);
             RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnUpStar, RedDotDataManager.Instance.GetCardUpStarRed(_cardData.id), "", -74, 60);
 
-            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnLv, RedDotDataManager.Instance.GetCardUpLvRed(_cardData.id), "", 0, 0);
-            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnStar, RedDotDataManager.Instance.GetCardUpStarRed(_cardData.id), "", 0, 0);
+            //RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnLv, RedDotDataManager.Instance.GetCardUpLvRed(_cardData.id), "", 0, 0);
+            //RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnStar, RedDotDataManager.Instance.GetCardUpStarRed(_cardData.id), "", 0, 0);
             RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id), "", 0, 0);
 
         }

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -27,11 +27,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -48,7 +43,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
@@ -82,6 +77,7 @@ namespace GFGGame
             mailDataMgr.CurPage = 0;
             UpdateNormal();
             AddEffect();
+            _ui.m_openViewAction.Play();
         }
         private void UpdateNormal()
         {
@@ -203,6 +199,11 @@ namespace GFGGame
         }
         protected override void OnHide()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
             base.OnHide();
         }
         protected override void RemoveEventListener()