iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.3.14 업데이트

Browse Source
This commit is contained in:
NTG_Lenovo 2024-11-11 16:29:53 +09:00
parent 3e78113bd5
commit 517e0324e8
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs
View File

@ -33,7 +33,7 @@ namespace BlueWater.Uis
[field: SerializeField, CLabel("업그레이드_스크립트")]
private GameObject _upgradePopup;
private bool _selectedPassive = false;
private bool _isSelectedPassive;
private void Awake()
{
@ -116,11 +116,9 @@ namespace BlueWater.Uis
//----카드 값 지정 및 초기화----
bool passiveCheck(CardData _card)
bool PassiveCheck(CardData card)
{
if(_card.Type == CardType.Passive) Debug.Log(_card.ScriptText+" : "+_selectedPassive);
return _selectedPassive && _card.Type == CardType.Passive;
return _isSelectedPassive && card.Type == CardType.Passive;
}
CardData card;
@ -137,7 +135,7 @@ namespace BlueWater.Uis
}
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|| passiveCheck(card));//패시브 검사
|| PassiveCheck(card));//패시브 검사
_tycoonCard01Componet.SetCard(card01Key);
@ -154,7 +152,7 @@ namespace BlueWater.Uis
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|| card02Key.Equals(card01Key) //중복검사
|| passiveCheck(card));//패시브 검사
|| PassiveCheck(card));//패시브 검사
_tycoonCard02Componet.SetCard(card02Key);
@ -171,7 +169,7 @@ namespace BlueWater.Uis
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|| card03Key.Equals(card01Key) || card03Key.Equals(card02Key) //중복검사
|| passiveCheck(card)); //패시브 검사
|| PassiveCheck(card)); //패시브 검사
_tycoonCard03Componet.SetCard(card03Key);
//-------------
@ -300,7 +298,7 @@ namespace BlueWater.Uis
default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return;
}
if (currTycoonCard.CardDataForIdx.Type == CardType.Passive) _selectedPassive = true;
if (currTycoonCard.CardDataForIdx.Type == CardType.Passive) _isSelectedPassive = true;
TycoonManager.Instance.CardDataSo.AddToSelectedCard(currTycoonCard.CardDataForIdx);

BIN
Assets/Resources/Excel/CardDataTable.xlsx
View File

Binary file not shown.