tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build issues due to comparison operators

Browse Source
This commit is contained in:
Michal Pikulski
2025-09-12 16:47:45 +02:00
parent 0057ae9fa3
commit 8cffe0b161
5 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Scripts/Core/GameManager.cs
View File

@@ -35,6 +35,14 @@ public class GameManager : MonoBehaviour
void Awake()
{
_instance = this;
if (gameSettings == null)
{
gameSettings = Resources.Load<GameSettings>("DefaultSettings");
if (gameSettings == null)
{
Debug.LogError("GameSettings asset not found in Resources!");
}
}
// DontDestroyOnLoad(gameObject);
}
@@ -69,7 +77,8 @@ public class GameManager : MonoBehaviour
if (gameSettings == null || gameSettings.combinationRules == null) return null;
foreach (var rule in gameSettings.combinationRules)
{
if ((rule.itemA == item1 && rule.itemB == item2) || (rule.itemA == item2 && rule.itemB == item1))
if ((PickupItemData.AreEquivalent(rule.itemA, item1) && PickupItemData.AreEquivalent(rule.itemB, item2)) ||
(PickupItemData.AreEquivalent(rule.itemA, item2) && PickupItemData.AreEquivalent(rule.itemB, item1)))
{
return rule;
}
@@ -85,7 +94,7 @@ public class GameManager : MonoBehaviour
if (gameSettings == null || gameSettings.slotItemConfigs == null || slotItem == null) return null;
foreach (var config in gameSettings.slotItemConfigs)
{
if (config.slotItem == slotItem)
if (PickupItemData.AreEquivalent(slotItem, config.slotItem))
return config;
}
return null;