Merge branch 'fix-pet' into 'main' (7d158169) · Commits · IF3210-2024-WIN / IF3210-2024-Unity-WIN · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IF3210-2024-Unity-WIN
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

IF3210-2024-WIN
IF3210-2024-Unity-WIN
Commits
7d158169

Commit 7d158169 authored 1 year ago by

Kandida Gunawan

Downloads
- Plain Diff

Merge branch 'fix-pet' into 'main'

Fix pet

See merge request !2

parents e08448af 9149a5dd

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Prefabs/Pet/Fighter.prefab 1 addition, 0 deletions

Assets/Prefabs/Pet/Fighter.prefab
Assets/Scenes/Level01.unity 2 additions, 2 deletions

Assets/Scenes/Level01.unity
Assets/Scripts/Enemy/EnemyAttack.cs 105 additions, 27 deletions

Assets/Scripts/Enemy/EnemyAttack.cs
Assets/Scripts/Enemy/JenderalAbility.cs 78 additions, 5 deletions

Assets/Scripts/Enemy/JenderalAbility.cs
Assets/Scripts/Enemy/RajaAbility.cs 90 additions, 5 deletions

Assets/Scripts/Enemy/RajaAbility.cs
Assets/Scripts/Pet/FighterAttack.cs 5 additions, 2 deletions

Assets/Scripts/Pet/FighterAttack.cs
Assets/Scripts/Pet/FighterMove.cs 37 additions, 13 deletions

Assets/Scripts/Pet/FighterMove.cs
Assets/Scripts/Pet/Follow.cs 2 additions, 0 deletions

Assets/Scripts/Pet/Follow.cs
Assets/Scripts/Pet/GoodPetHealth.cs 4 additions, 2 deletions

Assets/Scripts/Pet/GoodPetHealth.cs
Assets/Scripts/Pet/Healer.cs 1 addition, 4 deletions

Assets/Scripts/Pet/Healer.cs
Assets/Scripts/Weapon/ShotgunEnemyShooting.cs 9 additions, 2 deletions

Assets/Scripts/Weapon/ShotgunEnemyShooting.cs
ProjectSettings/ProjectVersion.txt 2 additions, 2 deletions

ProjectSettings/ProjectVersion.txt
ProjectSettings/TagManager.asset 0 additions, 3 deletions

ProjectSettings/TagManager.asset

with 336 additions and 67 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment