Commits · ec896092f3a3b627f8b1dc12335e053eb633ab17 · lmj / LuckFarm

13 Nov, 2020 35 commits
- 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
- 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 5 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