SweetJJuya
|
c4dc3500c3
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
# Conflicts:
# Assets/08.Spines/07.Animations/DDD.meta
# Assets/08.Spines/07.Animations/DDD/Props.meta
# Assets/08.Spines/07.Animations/DDD/Props/Pot.meta
# Assets/08.Spines/07.Animations/DDD/Props/Pot/Enable.anim
# Assets/08.Spines/07.Animations/DDD/Props/Pot/Enable.anim.meta
# Assets/08.Spines/07.Animations/DDD/Props/Pot/Idle.anim
# Assets/08.Spines/07.Animations/DDD/Props/Pot/Idle.anim.meta
# Assets/08.Spines/07.Animations/DDD/Props/Pot/Pot.controller
# Assets/08.Spines/07.Animations/DDD/Props/Pot/Pot.controller.meta
|
2025-02-18 15:57:56 +09:00 |
|