* 'develop' of https://bitbucket.org/usaya/popcorn: ハート演出調整 # Conflicts: # popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab |
||
|---|---|---|
| popcorn | ||
| .gitignore | ||
* 'develop' of https://bitbucket.org/usaya/popcorn: ハート演出調整 # Conflicts: # popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab |
||
|---|---|---|
| popcorn | ||
| .gitignore | ||