|
@@ -15,6 +15,7 @@ namespace GFGGame
|
|
|
private int _lastNum;
|
|
|
private int _curNum;
|
|
|
private int _cardId;
|
|
|
+ private string _fromUIType;
|
|
|
private CardLvlCfg _cardLvCfg;
|
|
|
private CardStarCfg _cardStarCfg;
|
|
|
private int _mainScore = 0;
|
|
@@ -60,6 +61,8 @@ namespace GFGGame
|
|
|
_lastNum = (int)(viewData as object[])[2];
|
|
|
_curNum = (int)(viewData as object[])[3];
|
|
|
_cardId = (int)(viewData as object[])[4];
|
|
|
+ if ((viewData as object[]).Length > 5)
|
|
|
+ _fromUIType = (string)(viewData as object[])[5];
|
|
|
|
|
|
if (_type == "lv")
|
|
|
{
|
|
@@ -98,7 +101,7 @@ namespace GFGGame
|
|
|
_ui.m_c1.selectedIndex = 2;
|
|
|
_cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
|
|
|
if (_cardStarCfg == null)
|
|
|
- ET.Log.Error("RenderListCardPropertyItemd _cardStarCfg 2 is null=" + _cardId + "==" + _lastNum);
|
|
|
+ ET.Log.Error("RenderListCardPropertyItemd _cardStarCfg 2 is null=" + _fromUIType +"=="+ _cardId + "==" + _lastNum);
|
|
|
_cardLvCfg = null;
|
|
|
_ui.m_listCardProperty.numItems = 1;
|
|
|
_ui.m_listLastCardProperty.numItems = 1;
|