Assets/Scripts/Main · 9ad959bd3eb9c5f892e41c4deb9fcee88f5a266f · 王雪伟 / MusicBigWatermelon · GitLab

History Find file

Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · 9ad959bd
王雪伟 authored Aug 02, 2021
```
# Conflicts:
#	Assets/Scenes/Game.unity
#	Assets/Scripts/Main/HomeInfoControl.cs
```
9ad959bd

Name	Last commit	Last update
..
AudioManager.cs		Loading commit data...
AudioManager.cs.meta		Loading commit data...
HomeInfoControl.cs		Loading commit data...
HomeInfoControl.cs.meta		Loading commit data...