Commits · 8c521c201b05d737c2b20c8c60eea5f0c316d77f · lmj / LuckFarm

13 Nov, 2020 21 commits
- 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
- fix bugs · e24ff8d4
  Mazy authored Nov 13, 2020
  
  e24ff8d4
- 优化广告bug · 93c765ca
  zhangshuai authored Nov 13, 2020
  
  93c765ca
- optimize code · 1b883c02
  Mazy authored Nov 13, 2020
  
  1b883c02
- Merge remote-tracking branch 'refs/remotes/origin/master' · 0357690c
  Mazy authored Nov 13, 2020
  
  0357690c
- sts · 85e55703
  Mazy authored Nov 13, 2020
  
  85e55703
- status · 7e31c36c
  Mazy authored Nov 13, 2020
  
  7e31c36c
- fix paizi bugs · 34c4db90
  Mazy authored Nov 13, 2020
  
  34c4db90
- 修改 log · f19e326b
  zhangshuai authored Nov 13, 2020
  
  f19e326b
- 修改缓存特殊情况的不连贯问题 · ed7779db
  zhangshuai authored Nov 13, 2020
  
  ed7779db
- Merge remote-tracking branch 'refs/remotes/origin/master' · 3cf191bf
  Mazy authored Nov 13, 2020
  
  3cf191bf
- change version · 0c7f83a0
  Mazy authored Nov 13, 2020
  
  0c7f83a0
- Merge remote-tracking branch 'refs/remotes/origin/master' · 9eb2a850
  Mazy authored Nov 13, 2020
  
  9eb2a850
- add cash alert view · c9b3ba6b
  Mazy authored Nov 13, 2020
  
  c9b3ba6b
- 修改统计 · ba8ac267
  zhangshuai authored Nov 13, 2020
  
  ba8ac267
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 0f746e60
  zhangshuai authored Nov 13, 2020
  
  0f746e60
- 修改域名 · f2c71023
  zhangshuai authored Nov 13, 2020
  
  f2c71023
- Merge remote-tracking branch 'refs/remotes/origin/master' · b283a9ba
  Mazy authored Nov 13, 2020
```
Conflicts:
	GYDemo/GYDemo/AppDelegate.mm
```
  b283a9ba
- fix : bugs · 6a4f4123
  Mazy authored Nov 13, 2020
  
  6a4f4123
12 Nov, 2020 17 commits
- add red pack gain alert · 93e15604
  Mazy authored Nov 12, 2020
  
  93e15604
- 修改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 2 commits
- no message · 6b2f4d0c
  zhangshuai authored Nov 11, 2020
  
  6b2f4d0c
- 修改广告细节逻辑 · 125d6ba8
  zhangshuai authored Nov 11, 2020
  
  125d6ba8