|
@@ -774,8 +774,10 @@ namespace GFGGame
|
|
|
int starLevelDodge = _cardData.star / _wordNumber;
|
|
|
for (int i = 0; i < _wordRow; i++)
|
|
|
{
|
|
|
- UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + i));
|
|
|
+ var dodgeStarObj = _comFosterBottom.target.GetChild("dodgeStar" + i);
|
|
|
+ UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(dodgeStarObj);
|
|
|
dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
|
|
|
+ dodgeStarObj.visible = i < _cardData.itemCfg.starDescArr.Length;
|
|
|
UI_ComDodgeStar.ProxyEnd();
|
|
|
}
|
|
|
}
|
|
@@ -783,20 +785,23 @@ namespace GFGGame
|
|
|
private void UpdateUpStarOfText()
|
|
|
{
|
|
|
int starLevel = _cardData.star / _wordNumber;
|
|
|
+ _wordRow = _cardData.itemCfg.starDescArr.Length;
|
|
|
if (starLevel >= _wordRow)
|
|
|
starLevel = _wordRow - 1;
|
|
|
int index = starLevel * _wordNumber;
|
|
|
UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
|
|
|
string starDesc = "";
|
|
|
- for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
|
|
|
- {
|
|
|
- index++;
|
|
|
- string str = _cardData.itemCfg.starDescArr[starLevel][j].ToString();
|
|
|
- if (j < _cardData.itemCfg.starDescArr[starLevel].Length - 1)
|
|
|
- str += " /";
|
|
|
+ //if (starLevel < _cardData.itemCfg.starDescArr.Length) {
|
|
|
+ for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
|
|
|
+ {
|
|
|
+ index++;
|
|
|
+ string str = _cardData.itemCfg.starDescArr[starLevel][j].ToString();
|
|
|
+ if (j < _cardData.itemCfg.starDescArr[starLevel].Length - 1)
|
|
|
+ str += " /";
|
|
|
|
|
|
- starDesc += index <= _cardData.star ? StringUtil.GetColorText(str, "#E5892F") : StringUtil.GetColorText(str, "#C8B693");
|
|
|
- }
|
|
|
+ starDesc += index <= _cardData.star ? StringUtil.GetColorText(str, "#E5892F") : StringUtil.GetColorText(str, "#C8B693");
|
|
|
+ }
|
|
|
+ //}
|
|
|
comStarItem.m_txtContent.text = starDesc;
|
|
|
UI_ComStarItem.ProxyEnd();
|
|
|
}
|
|
@@ -920,7 +925,6 @@ namespace GFGGame
|
|
|
|
|
|
LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
|
|
|
UpdateRedDot();
|
|
|
-
|
|
|
if (_cardData.star % 5 == 0) {
|
|
|
int starLevelDodge = _cardData.star / _wordNumber;
|
|
|
int starLevel = _cardData.star / _wordNumber - 1;
|