Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -88,6 +88,8 @@ namespace GFGGame
                 _ui.m_txtLast.text = string.Format("{0}星", _lastNum / 5);
                 _ui.m_txtNow.text = string.Format("{0}星", _curNum / 5);
                 _cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
+                if (_cardStarCfg == null)
+                    ET.Log.Error("RenderListCardPropertyItemd _cardStarCfg 1 is null=" + _cardId + "==" + _lastNum);
                 _cardLvCfg = null;
                 _ui.m_listCardProperty.numItems = 1;
                 _ui.m_listLastCardProperty.numItems = 1;
@@ -95,6 +97,8 @@ namespace GFGGame
             else { 
                 _ui.m_c1.selectedIndex = 2;
                 _cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
+                if (_cardStarCfg == null)
+                    ET.Log.Error("RenderListCardPropertyItemd _cardStarCfg 2 is null=" + _cardId + "==" + _lastNum);
                 _cardLvCfg = null;
                 _ui.m_listCardProperty.numItems = 1;
                 _ui.m_listLastCardProperty.numItems = 1;