Commits · 6f9c574f6bf8a49c39e649da6f897806be0d4943 · lmj / LuckFarm

16 Nov, 2020 9 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' · 6f9c574f
  Mazy authored Nov 16, 2020
  
  6f9c574f
- add play_adVideo_end_welfareTask log · bf81068f
  Mazy authored Nov 16, 2020
  
  bf81068f
- 修改释放问题 · f960725e
  zhangshuai authored Nov 16, 2020
  
  f960725e
- Merge remote-tracking branch 'refs/remotes/origin/master' · c0afc023
  Mazy authored Nov 16, 2020
  
  c0afc023
- no message · 581988a9
  zhangshuai authored Nov 16, 2020
  
  581988a9
- Merge remote-tracking branch 'refs/remotes/origin/master' · d1b3458d
  Mazy authored Nov 16, 2020
  
  d1b3458d
- optimize alert ad show logic · 89a79c72
  Mazy authored Nov 16, 2020
  
  89a79c72
- 修改缓存机制 · 2804a8ed
  zhangshuai authored Nov 16, 2020
  
  2804a8ed
- optimize ad · ccf21104
  Mazy authored Nov 16, 2020
  
  ccf21104
14 Nov, 2020 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' · f669091d
  Mazy authored Nov 14, 2020
```
Conflicts:
	GYDemo/GYDemo.xcodeproj/project.pbxproj
```
  f669091d
- fix double click bugs · fd14a671
  Mazy authored Nov 14, 2020
  
  fd14a671
13 Nov, 2020 29 commits
- no message · 5a43a938
  zhangshuai authored Nov 13, 2020
  
  5a43a938
- 修改版本号 · f1cba92a
  zhangshuai authored Nov 13, 2020
  
  f1cba92a
- no message · bf8306d5
  zhangshuai authored Nov 13, 2020
  
  bf8306d5
- xx · 70ac3487
  Mazy authored Nov 13, 2020
  
  70ac3487
- fix alert view bugs · 41bfb31f
  Mazy authored Nov 13, 2020
  
  41bfb31f
- 修改埋点 · 3c83a47e
  zhangshuai authored Nov 13, 2020
  
  3c83a47e
- 修改打点 · 4e5ee526
  zhangshuai authored Nov 13, 2020
  
  4e5ee526
- change source · 4ec49caa
  Mazy authored Nov 13, 2020
  
  4ec49caa
- Merge remote-tracking branch 'refs/remotes/origin/master' · fdd158ee
  Mazy authored Nov 13, 2020
  
  fdd158ee
- change source · 923ce3e7
  Mazy authored Nov 13, 2020
  
  923ce3e7
- 增加埋点 · 0540d8db
  zhangshuai authored Nov 13, 2020
  
  0540d8db
- 增加显示上报 · 61fc80cc
  zhangshuai authored Nov 13, 2020
  
  61fc80cc
- merge · ec896092
  Mazy authored Nov 13, 2020
  
  ec896092
- Merge remote-tracking branch 'refs/remotes/origin/master' · bbf0d4f3
  Mazy authored Nov 13, 2020
  
  bbf0d4f3
- change api to dis · d403a90a
  Mazy authored Nov 13, 2020
  
  d403a90a
- 修改超时机制 · 1ff9b3c8
  zhangshuai authored Nov 13, 2020
  
  1ff9b3c8
- optimize code logic · 3fe2b09b
  Mazy authored Nov 13, 2020
  
  3fe2b09b
- 修改广告 · 30f4c293
  zhangshuai authored Nov 13, 2020
  
  30f4c293
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 7f2041c6
  zhangshuai authored Nov 13, 2020
  
  7f2041c6
- 增加超时机制 · 870e12b0
  zhangshuai authored Nov 13, 2020
  
  870e12b0
- fix big bugs · 2da0d055
  Mazy authored Nov 13, 2020
  
  2da0d055
- merge from shuai · 97564e65
  Mazy authored Nov 13, 2020
  
  97564e65
- Merge remote-tracking branch 'refs/remotes/origin/master' · 103b73c1
  Mazy authored Nov 13, 2020
```
Conflicts:
	GYDemo/GYDemo/AppDelegate.mm
```
  103b73c1
- fix bugs · 46889af2
  Mazy authored Nov 13, 2020
  
  46889af2
- 修改潜在卡死逻辑 · a60910bf
  zhangshuai authored Nov 13, 2020
  
  a60910bf
- fix bugs · 58efc6bd
  Mazy authored Nov 13, 2020
  
  58efc6bd
- merge · 8c521c20
  Mazy authored Nov 13, 2020
  
  8c521c20
- merge · 9474f79f
  Mazy authored Nov 13, 2020
  
  9474f79f
- Merge remote-tracking branch 'refs/remotes/origin/master' · 973e024b
  Mazy authored Nov 13, 2020
```
Conflicts:
	GYDemo/GYDemo/Network/CGNetworkTools.m
```
  973e024b