|
@@ -29,6 +29,8 @@ namespace GFGGame
|
|
private int wordNumber = 5;//字每行个数
|
|
private int wordNumber = 5;//字每行个数
|
|
private int nowIndex = 0;
|
|
private int nowIndex = 0;
|
|
private bool refDodgeStar = true;
|
|
private bool refDodgeStar = true;
|
|
|
|
+ private int _isAutoSelect = 0;
|
|
|
|
+
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI3;
|
|
private EffectUI _effectUI3;
|
|
private EffectUI _effectUI4;
|
|
private EffectUI _effectUI4;
|
|
@@ -701,8 +703,8 @@ namespace GFGGame
|
|
ET.Log.Error("词牌:" + _cardData.id + " 无" + _cardData.star + "星升星配置");
|
|
ET.Log.Error("词牌:" + _cardData.id + " 无" + _cardData.star + "星升星配置");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
- _comFosterBottom.m_btnCheckAuto.selected = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect) == 1;
|
|
|
|
|
|
+ _isAutoSelect = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect);
|
|
|
|
+ _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
|
|
|
|
|
|
//升星后星数正5才不进入
|
|
//升星后星数正5才不进入
|
|
if (refDodgeStar || _cardData.star % 5 != 0) {
|
|
if (refDodgeStar || _cardData.star % 5 != 0) {
|
|
@@ -789,6 +791,12 @@ namespace GFGGame
|
|
listItem.m_QualityType.selectedIndex = 4;
|
|
listItem.m_QualityType.selectedIndex = 4;
|
|
int needCount = cardStarCfg.materiarsArr[index][1];
|
|
int needCount = cardStarCfg.materiarsArr[index][1];
|
|
long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
|
|
long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
|
|
|
|
+ if (_isAutoSelect == 1) {
|
|
|
|
+ if(index == 0)
|
|
|
|
+ hasCount += ItemDataManager.GetItemNum(6003001);
|
|
|
|
+ else
|
|
|
|
+ hasCount += ItemDataManager.GetItemNum(6003002);
|
|
|
|
+ }
|
|
|
|
|
|
listItem.m_txtDecomCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FFFFFF");// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
|
|
listItem.m_txtDecomCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FFFFFF");// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
|
|
listItem.m_txtDecomHasCount.text = "/" + needCount.ToString(); //; hasCount.ToString();
|
|
listItem.m_txtDecomHasCount.text = "/" + needCount.ToString(); //; hasCount.ToString();
|
|
@@ -878,7 +886,7 @@ namespace GFGGame
|
|
}
|
|
}
|
|
private async void UpStar()
|
|
private async void UpStar()
|
|
{
|
|
{
|
|
- _comFosterBottom.m_btnCheckAuto.selected = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect) == 1;
|
|
|
|
|
|
+ _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
|
|
bool result = await CardSProxy.UpgradeCardStar(_cardData.id, _comFosterBottom.m_btnCheckAuto.selected);
|
|
bool result = await CardSProxy.UpgradeCardStar(_cardData.id, _comFosterBottom.m_btnCheckAuto.selected);
|
|
if (result)
|
|
if (result)
|
|
{
|
|
{
|
|
@@ -1006,6 +1014,19 @@ namespace GFGGame
|
|
private void OnBtnCheckAuto()
|
|
private void OnBtnCheckAuto()
|
|
{
|
|
{
|
|
var success = CardSProxy.SaveIsAutoSelect(_comFosterBottom.m_btnCheckAuto.selected);
|
|
var success = CardSProxy.SaveIsAutoSelect(_comFosterBottom.m_btnCheckAuto.selected);
|
|
|
|
+ CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
|
|
|
|
+ if (cardStarCfg == null)
|
|
|
|
+ {
|
|
|
|
+ ET.Log.Error("词牌:" + _cardData.id + " 无" + _cardData.star + "星升星配置");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if (_isAutoSelect == 0)
|
|
|
|
+ _isAutoSelect = 1;
|
|
|
|
+ else
|
|
|
|
+ _isAutoSelect = 0;
|
|
|
|
+
|
|
|
|
+ _comFosterBottom.m_listStarConsume.data = cardStarCfg;
|
|
|
|
+ _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
|
|
}
|
|
}
|
|
|
|
|
|
private void OnBtnUpSkill()
|
|
private void OnBtnUpSkill()
|