Commits · 305340f5155ee48bb56c28e39ba9f753c4eb8c3a · 王雪伟 / MusicBigWatermelon

03 Aug, 2021 25 commits
- 11 · 305340f5
  王雪伟 authored Aug 03, 2021
  
  305340f5
- 1 · 182ceff0
  LiLiuZhou authored Aug 03, 2021
  
  182ceff0
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · 41b91a5a
  LiLiuZhou authored Aug 03, 2021
  
  41b91a5a
- 修改主面板 · b72fbad5
  王雪伟 authored Aug 03, 2021
  
  b72fbad5
- 1 · 89b51fae
  LiLiuZhou authored Aug 03, 2021
  
  89b51fae
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · 89bd2939
  王雪伟 authored Aug 03, 2021
  
  89bd2939
- 填充红包面板数据 · 922a634d
  王雪伟 authored Aug 03, 2021
  
  922a634d
- 1 · 53f5d6f7
  LiLiuZhou authored Aug 03, 2021
  
  53f5d6f7
- 1 · b1a0ee9d
  LiLiuZhou authored Aug 03, 2021
  
  b1a0ee9d
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · a8c07a3c
  LiLiuZhou authored Aug 03, 2021
  
  a8c07a3c
- 合成奖励 · 956a91c2
  王雪伟 authored Aug 03, 2021
  
  956a91c2
- 11 · 1c9e3705
  LiLiuZhou authored Aug 03, 2021
  
  1c9e3705
- hebing · d2be866f
  王雪伟 authored Aug 03, 2021
  
  d2be866f
- 加入合成上报 · 62b8e2f5
  王雪伟 authored Aug 03, 2021
  
  62b8e2f5
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · a627fb07
  LiLiuZhou authored Aug 03, 2021
  
  a627fb07
- 1 · bc12ccce
  LiLiuZhou authored Aug 03, 2021
  
  bc12ccce
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · 73b5c30f
  王雪伟 authored Aug 03, 2021
  
  73b5c30f
- 修改接口请求 · c74f1c3c
  王雪伟 authored Aug 03, 2021
  
  c74f1c3c
- 1 · 0e676516
  LiLiuZhou authored Aug 03, 2021
  
  0e676516
- 1 · ddc84216
  LiLiuZhou authored Aug 03, 2021
  
  ddc84216
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · 0fa10fd5
  王雪伟 authored Aug 03, 2021
  
  0fa10fd5
- 合成音乐 · 3e4b65bc
  王雪伟 authored Aug 03, 2021
  
  3e4b65bc
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · e2c8af77
  LiLiuZhou authored Aug 03, 2021
  
  e2c8af77
- 1 · 56181193
  LiLiuZhou authored Aug 03, 2021
  
  56181193
- 加入报错log · 6d0dd035
  王雪伟 authored Aug 03, 2021
  
  6d0dd035
02 Aug, 2021 15 commits
- 11 · 93f53a69
  LiLiuZhou authored Aug 02, 2021
  
  93f53a69
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · b76fb8ab
  LiLiuZhou authored Aug 02, 2021
  
  b76fb8ab
- 加入AudioManager · 83d24a6b
  王雪伟 authored Aug 02, 2021
  
  83d24a6b
- 111 · fb7e49e5
  LiLiuZhou authored Aug 02, 2021
  
  fb7e49e5
- 加入接口 · 5124f88f
  王雪伟 authored Aug 02, 2021
  
  5124f88f
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · e56ed0a6
  王雪伟 authored Aug 02, 2021
  
  e56ed0a6
- 加入上报接口 · e84bc359
  王雪伟 authored Aug 02, 2021
  
  e84bc359
- Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon · a06160ca
  LiLiuZhou authored Aug 02, 2021
  
  a06160ca
- 11 · 4a82cfaa
  LiLiuZhou authored Aug 02, 2021
  
  4a82cfaa
- 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
- 加入接口 · 1816c9f9
  王雪伟 authored Aug 02, 2021
  
  1816c9f9
- 11 · 6d5a791c
  LiLiuZhou authored Aug 02, 2021
  
  6d5a791c
- 1 · 77aaf348
  LiLiuZhou authored Aug 02, 2021
  
  77aaf348
- 1 · 53a97488
  LiLiuZhou authored Aug 02, 2021
  
  53a97488
- 兑换水果 · 174224b3
  王雪伟 authored Aug 02, 2021
  
  174224b3