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

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -172,6 +172,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBtnNewYearRedEnvelope);
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
             EventAgent.AddEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward); 
+            EventAgent.AddEventListener(ConstMessage.CARD_INFO, CardBgRes);
         }
 
         protected override void RemoveEventListener()
@@ -188,6 +189,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
             EventAgent.RemoveEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_INFO, CardBgRes);
         }
 
         protected override void OnShown()
@@ -944,23 +946,31 @@ namespace GFGGame
             }
             if(MainDataManager.Instance.CardBgID == 0)
             {
-                _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = "";
+                _ui.m_cardBgIcon.target.visible = false;
+                _ui.m_cardBg.target.visible = false;
                 return;
             }
             ItemCfg cardItem = ItemCfgArray.Instance.GetCfg(MainDataManager.Instance.CardBgID);
             string resName = cardItem.res;
             string resPath = ResPathUtil.GetCardAnimationPath(resName);
+            var _cardData = CardDataManager.GetCardDataById(MainDataManager.Instance.CardBgID);
             Vector2 omCardImgResTargetSize = new Vector2((ViewGlobal.GetRealTopOffset() + _ui.target.height) * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, (ViewGlobal.GetRealTopOffset() + _ui.target.height));
-            if (YooAssets.CheckResExist(resPath))
+            if (_cardData != null && _cardData.itemCfg.animationCardStar > 0
+                && _cardData.star >= _cardData.itemCfg.animationCardStar
+                && YooAssets.CheckResExist(resPath))
             {
                 await LoadManager.Instance.CheckResExsitedOrDownload(resPath);
                 _effectUI1 = new EffectUI();
                 _effectUI1.Reset(_ui.m_cardBg.m_comCardHolder.m_holder, resName, resName, 110, EffectUIType.Card);
                 float offY = GRoot.inst.height / 1000;
+                _ui.m_cardBg.target.visible = true;
+                _ui.m_cardBgIcon.target.visible = false;
                 _ui.m_cardBg.m_comCardHolder.m_holder.y = _ui.m_cardBg.m_comCardHolder.m_holder.y + (offY*50);
             }
             else
             {
+                _ui.m_cardBg.target.visible = false;
+                _ui.m_cardBgIcon.target.visible = true;
                 _ui.m_cardBgIcon.m_ComCardImgRes.target.size = omCardImgResTargetSize;
                 _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(resName);
             }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeThemeView.cs

@@ -132,6 +132,7 @@ namespace GFGGame
         {
             await ActivitySProxy.SetOnceStatus(MainDataManager.Instance.CardBgKey, 0, 0);
             MainDataManager.Instance.CardBgID = 0;
+            PromptController.Instance.ShowFloatTextPrompt("关闭成功！");
             this.Hide();
         }
         private void AddEffect()