Merge branch 'main' of...
Merge branch 'main' of https://gitlab.informatika.org/if3210-2024-win/if3210-2024-unity-win into fix-pet
Showing
- Assets/Prefabs/Enemies/Hellephant.prefab 1 addition, 3 deletionsAssets/Prefabs/Enemies/Hellephant.prefab
- Assets/Prefabs/Enemies/ZomBear.prefab 3 additions, 1 deletionAssets/Prefabs/Enemies/ZomBear.prefab
- Assets/Prefabs/Enemies/ZomBunny Leader.prefab 1 addition, 3 deletionsAssets/Prefabs/Enemies/ZomBunny Leader.prefab
- Assets/Prefabs/Enemies/ZomBunny.prefab 3 additions, 1 deletionAssets/Prefabs/Enemies/ZomBunny.prefab
- Assets/Prefabs/Pet/Buff.prefab 1 addition, 1 deletionAssets/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/Prefabs/ShopKeeper/Item Template.prefab 3 additions, 3 deletionsAssets/Prefabs/ShopKeeper/Item Template.prefab
- Assets/Prefabs/Weapons/Shotgun.prefab 3 additions, 1 deletionAssets/Prefabs/Weapons/Shotgun.prefab
- Assets/Scenes/Level01.unity 762 additions, 45 deletionsAssets/Scenes/Level01.unity
- Assets/Scenes/MainMenu.unity 62 additions, 0 deletionsAssets/Scenes/MainMenu.unity
- Assets/Scriptable Objects/Fighter.asset 2 additions, 3 deletionsAssets/Scriptable Objects/Fighter.asset
- Assets/Scriptable Objects/Healer.asset 2 additions, 2 deletionsAssets/Scriptable Objects/Healer.asset
- Assets/Scripts/Cheats/Cheats.cs 33 additions, 20 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 1 addition, 3 deletionsAssets/Scripts/DataUtils/GameData.cs.meta
- Assets/Scripts/Enemy/EnemyAttack.cs 1 addition, 1 deletionAssets/Scripts/Enemy/EnemyAttack.cs
Please register or sign in to comment