fix: fix merge conflict with staging
Showing
- Assets/Animation/GameOver.anim 140 additions, 0 deletionsAssets/Animation/GameOver.anim
- Assets/Animation/GameOver.anim.meta 8 additions, 0 deletionsAssets/Animation/GameOver.anim.meta
- Assets/Animation/GameOverMenu.anim 227 additions, 0 deletionsAssets/Animation/GameOverMenu.anim
- Assets/Animation/GameOverMenu.anim.meta 8 additions, 0 deletionsAssets/Animation/GameOverMenu.anim.meta
- Assets/Animation/GameOverText.anim 347 additions, 0 deletionsAssets/Animation/GameOverText.anim
- Assets/Animation/GameOverText.anim.meta 8 additions, 0 deletionsAssets/Animation/GameOverText.anim.meta
- Assets/Animation/GameOverText.controller 72 additions, 0 deletionsAssets/Animation/GameOverText.controller
- Assets/Animation/GameOverText.controller.meta 8 additions, 0 deletionsAssets/Animation/GameOverText.controller.meta
- Assets/Animation/GameOverUI.controller 72 additions, 0 deletionsAssets/Animation/GameOverUI.controller
- Assets/Animation/GameOverUI.controller.meta 8 additions, 0 deletionsAssets/Animation/GameOverUI.controller.meta
- Assets/Animation/MenuButton 1.controller 72 additions, 0 deletionsAssets/Animation/MenuButton 1.controller
- Assets/Animation/MenuButton 1.controller.meta 8 additions, 0 deletionsAssets/Animation/MenuButton 1.controller.meta
- Assets/Animation/MenuButton.controller 72 additions, 0 deletionsAssets/Animation/MenuButton.controller
- Assets/Animation/MenuButton.controller.meta 8 additions, 0 deletionsAssets/Animation/MenuButton.controller.meta
- Assets/Animation/Sword.controller 156 additions, 0 deletionsAssets/Animation/Sword.controller
- Assets/Animation/Sword.controller.meta 8 additions, 0 deletionsAssets/Animation/Sword.controller.meta
- Assets/Animation/SwordSwing.anim 391 additions, 0 deletionsAssets/Animation/SwordSwing.anim
- Assets/Animation/SwordSwing.anim.meta 8 additions, 0 deletionsAssets/Animation/SwordSwing.anim.meta
- Assets/Animation/WeaponSlots.controller 72 additions, 0 deletionsAssets/Animation/WeaponSlots.controller
- Assets/Animation/WeaponSlots.controller.meta 8 additions, 0 deletionsAssets/Animation/WeaponSlots.controller.meta
Please register or sign in to comment