[Fix] Resolve Conflict
Showing
- Assets/Prefabs/Pet/Buff.prefab 4 additions, 0 deletionsAssets/Prefabs/Pet/Buff.prefab
- Assets/Prefabs/Pet/Fighter.prefab 1 addition, 1 deletionAssets/Prefabs/Pet/Fighter.prefab
- Assets/Prefabs/Pet/Healer.prefab 1 addition, 1 deletionAssets/Prefabs/Pet/Healer.prefab
- Assets/Prefabs/Pet/PetManager.prefab 48 additions, 0 deletionsAssets/Prefabs/Pet/PetManager.prefab
- Assets/Prefabs/Pet/PetManager.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/Pet/PetManager.prefab.meta
- Assets/Scenes/Level01.unity 136 additions, 0 deletionsAssets/Scenes/Level01.unity
- Assets/Scripts/Cheats/Cheats.cs 28 additions, 16 deletionsAssets/Scripts/Cheats/Cheats.cs
- Assets/Scripts/DataUtils.meta 8 additions, 0 deletionsAssets/Scripts/DataUtils.meta
- Assets/Scripts/DataUtils/GameData.cs 35 additions, 0 deletionsAssets/Scripts/DataUtils/GameData.cs
- Assets/Scripts/DataUtils/GameData.cs.meta 11 additions, 0 deletionsAssets/Scripts/DataUtils/GameData.cs.meta
- Assets/Scripts/Enemy/EnemyHealth.cs 4 additions, 4 deletionsAssets/Scripts/Enemy/EnemyHealth.cs
- Assets/Scripts/Enemy/EnemyMovement.cs 162 additions, 166 deletionsAssets/Scripts/Enemy/EnemyMovement.cs
- Assets/Scripts/Managers/DataPersistenceManager.cs 75 additions, 0 deletionsAssets/Scripts/Managers/DataPersistenceManager.cs
- Assets/Scripts/Managers/DataPersistenceManager.cs.meta 11 additions, 0 deletionsAssets/Scripts/Managers/DataPersistenceManager.cs.meta
- Assets/Scripts/Managers/IDataPersistence.cs 10 additions, 0 deletionsAssets/Scripts/Managers/IDataPersistence.cs
- Assets/Scripts/Managers/IDataPersistence.cs.meta 11 additions, 0 deletionsAssets/Scripts/Managers/IDataPersistence.cs.meta
- Assets/Scripts/Managers/PetManager.cs 77 additions, 0 deletionsAssets/Scripts/Managers/PetManager.cs
- Assets/Scripts/Managers/PetManager.cs.meta 11 additions, 0 deletionsAssets/Scripts/Managers/PetManager.cs.meta
- Assets/Scripts/Managers/ScoreManager.cs 11 additions, 1 deletionAssets/Scripts/Managers/ScoreManager.cs
- Assets/Scripts/Pet/GoodPetHealth.cs 2 additions, 1 deletionAssets/Scripts/Pet/GoodPetHealth.cs
Please register or sign in to comment