Commits · e3e6e25fb8c67de387df3c92dd2dd08977b14f21 · lmj / LuckFarm

12 Nov, 2020 16 commits
- 修改bug 优化缓存 · e3e6e25f
  zhangshuai authored Nov 12, 2020
  
  e3e6e25f
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 292e859f
  zhangshuai authored Nov 12, 2020
  
  292e859f
- 增加新埋点 · 6e6877c4
  zhangshuai authored Nov 12, 2020
  
  6e6877c4
- add ad in alert · fd0ab9d0
  Mazy authored Nov 12, 2020
  
  fd0ab9d0
- fix voice and withdraw event bugs · 87dd3a5b
  Mazy authored Nov 12, 2020
  
  87dd3a5b
- Merge remote-tracking branch 'refs/remotes/origin/master' · 65e836e9
  Mazy authored Nov 12, 2020
```
Conflicts:
	GYDemo/GYDemo/SCAds/IOSADManager.m
```
  65e836e9
- feat: add wechat login · 5e820025
  Mazy authored Nov 12, 2020
  
  5e820025
- 增加位置埋点 · 07be9025
  zhangshuai authored Nov 12, 2020
  
  07be9025
- 修改埋点 · 1b0168a5
  zhangshuai authored Nov 12, 2020
  
  1b0168a5
- 修改广告平台缓存的个数 · c0fbe5c6
  zhangshuai authored Nov 12, 2020
  
  c0fbe5c6
- optimize h5 · 8b9529d2
  Mazy authored Nov 12, 2020
  
  8b9529d2
- 修改缓存不连贯的bug · 2c3ffd58
  zhangshuai authored Nov 12, 2020
  
  2c3ffd58
- v3.1 · c74de4bc
  Mazy authored Nov 12, 2020
  
  c74de4bc
- v3 · 6a383bf7
  Mazy authored Nov 12, 2020
  
  6a383bf7
- refactor: farm v3 · 3586e567
  Mazy authored Nov 12, 2020
  
  3586e567
- 处理bug · 60fcc8e8
  zhangshuai authored Nov 12, 2020
  
  60fcc8e8
11 Nov, 2020 5 commits
- no message · 6b2f4d0c
  zhangshuai authored Nov 11, 2020
  
  6b2f4d0c
- 修改广告细节逻辑 · 125d6ba8
  zhangshuai authored Nov 11, 2020
  
  125d6ba8
- 更换广告逻辑增加预加载逻辑 · d5c26465
  zhangshuai authored Nov 11, 2020
  
  d5c26465
- fix: 领金币添加任务跳转 · 04e84cdf
  Mazy authored Nov 11, 2020
  
  04e84cdf
- fix bugs · 2e3d6597
  Mazy authored Nov 11, 2020
  
  2e3d6597
30 Oct, 2020 2 commits
- fix bug · dd37ed05
  lmj_521aiau@163.com authored Oct 30, 2020
  
  dd37ed05
- fix bug · e0bb0cf7
  lmj_521aiau@163.com authored Oct 30, 2020
  
  e0bb0cf7
29 Oct, 2020 1 commit
- ads · 4c90aa55
  lmj_521aiau@163.com authored Oct 29, 2020
  
  4c90aa55
28 Oct, 2020 6 commits
- no message · e51b0931
  lmj_521aiau@163.com authored Oct 28, 2020
  
  e51b0931
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 45704270
  lmj_521aiau@163.com authored Oct 28, 2020
  
  45704270
- no message · bfefcac8
  lmj_521aiau@163.com authored Oct 28, 2020
  
  bfefcac8
- update farm project · e15bbc11
  Mazy authored Oct 28, 2020
  
  e15bbc11
- update unity ios project · fc408375
  Mazy authored Oct 28, 2020
  
  fc408375
- adsManager UM Mobclick · e7976652
  lmj_521aiau@163.com authored Oct 28, 2020
  
  e7976652
27 Oct, 2020 4 commits
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · f452a237
  lmj_521aiau@163.com authored Oct 27, 2020
```
# Conflicts:
#	GYDemo/GYDemo.xcodeproj/project.pbxproj
#	GYDemo/GYDemo/AppDelegate.mm
```
  f452a237
- no message · b62bc345
  lmj_521aiau@163.com authored Oct 27, 2020
  
  b62bc345
- wheel · 86a25e19
  lmj_521aiau@163.com authored Oct 27, 2020
  
  86a25e19
- ads · 53d8f47e
  lmj_521aiau@163.com authored Oct 27, 2020
  
  53d8f47e
26 Oct, 2020 1 commit
- wx · 3104e4c6
  lmj_521aiau@163.com authored Oct 26, 2020
  
  3104e4c6
23 Oct, 2020 5 commits
- change unity project · 5e50d4d6
  Mazy authored Oct 23, 2020
  
  5e50d4d6
- no message · 5e06a8ec
  lmj_521aiau@163.com authored Oct 23, 2020
  
  5e06a8ec
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 9f3f66af
  lmj_521aiau@163.com authored Oct 23, 2020
  
  9f3f66af
- no message · 545d6cb4
  lmj_521aiau@163.com authored Oct 23, 2020
  
  545d6cb4
- change unity form project · c9031a77
  Mazy authored Oct 23, 2020
  
  c9031a77