[Fix] Refactor project
This commit is contained in:
@@ -77,7 +77,7 @@ namespace YachtDice.Inventory
|
||||
{
|
||||
if (instance.Definition == null) return;
|
||||
|
||||
int sellPrice = instance.Definition.SellPrice;
|
||||
var sellPrice = instance.Definition.SellPrice;
|
||||
_model.RemoveModifier(instance);
|
||||
|
||||
if (_currencyBank != null)
|
||||
|
||||
@@ -40,8 +40,9 @@ namespace YachtDice.Inventory
|
||||
{
|
||||
var result = new List<ModifierDefinition>();
|
||||
var active = _registry.Active;
|
||||
for (int i = 0; i < active.Count; i++)
|
||||
result.Add(active[i].Definition);
|
||||
foreach (var t in active)
|
||||
result.Add(t.Definition);
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ namespace YachtDice.Inventory
|
||||
|
||||
if (sellPriceText != null) sellPriceText.text = def.SellPrice.ToString();
|
||||
|
||||
bool isActive = _instance.IsActive;
|
||||
var isActive = _instance.IsActive;
|
||||
|
||||
if (activateButton != null)
|
||||
{
|
||||
|
||||
@@ -40,11 +40,10 @@ namespace YachtDice.Inventory
|
||||
{
|
||||
ClearSlots();
|
||||
|
||||
int activeCount = 0;
|
||||
var activeCount = 0;
|
||||
|
||||
for (int i = 0; i < owned.Count; i++)
|
||||
foreach (var inst in owned)
|
||||
{
|
||||
var inst = owned[i];
|
||||
if (inst.IsActive) activeCount++;
|
||||
|
||||
var slot = Instantiate(slotPrefab, slotContainer);
|
||||
@@ -61,13 +60,14 @@ namespace YachtDice.Inventory
|
||||
|
||||
private void ClearSlots()
|
||||
{
|
||||
for (int i = 0; i < _spawnedSlots.Count; i++)
|
||||
foreach (var t in _spawnedSlots)
|
||||
{
|
||||
_spawnedSlots[i].OnActivateClicked -= HandleActivate;
|
||||
_spawnedSlots[i].OnDeactivateClicked -= HandleDeactivate;
|
||||
_spawnedSlots[i].OnSellClicked -= HandleSell;
|
||||
Destroy(_spawnedSlots[i].gameObject);
|
||||
t.OnActivateClicked -= HandleActivate;
|
||||
t.OnDeactivateClicked -= HandleDeactivate;
|
||||
t.OnSellClicked -= HandleSell;
|
||||
Destroy(t.gameObject);
|
||||
}
|
||||
|
||||
_spawnedSlots.Clear();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user