From 517e0324e8c0b439492d75116f08f817cbbc6ba5 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 11 Nov 2024 16:29:53 +0900 Subject: [PATCH] =?UTF-8?q?0.3.3.14=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02.Scripts/Ui/Tycoon/TycoonSelectCard.cs | 16 +++++++--------- Assets/Resources/Excel/CardDataTable.xlsx | Bin 11053 -> 11063 bytes 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 1b23ed267..8175673f0 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -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); diff --git a/Assets/Resources/Excel/CardDataTable.xlsx b/Assets/Resources/Excel/CardDataTable.xlsx index 5549b3f3e21951aa05a3b9e531a35e391a1dfe5d..3068789c6b3ac115842eff6554174fb2d3187b6d 100644 GIT binary patch delta 3079 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