Commits · 3fa8b50b9dd9eaa7612de5f773a6685fbe9fe7ea · lmj / LuckFarm

25 Nov, 2020 3 commits
- wx pod · 3fa8b50b
  Mazy authored Nov 25, 2020
  
  3fa8b50b
- merge · f2346749
  Mazy authored Nov 25, 2020
  
  f2346749
- optimzie cide · 92e0a46f
  Mazy authored Nov 25, 2020
  
  92e0a46f
24 Nov, 2020 1 commit
- 修改 source · 6a1e2a44
  zhangshuai authored Nov 24, 2020
```
修改广告 埋点
```
  6a1e2a44
21 Nov, 2020 9 commits
- fix alert bugs · 980b4dbe
  Mazy authored Nov 21, 2020
  
  980b4dbe
- feat: add rule alert view · 3d72b7c7
  Mazy authored Nov 21, 2020
  
  3d72b7c7
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 084455d3
  zhangshuai authored Nov 21, 2020
  
  084455d3
- 修改库和配置 · d5c2ceea
  zhangshuai authored Nov 21, 2020
  
  d5c2ceea
- Merge remote-tracking branch 'refs/remotes/origin/master' · c8b38b14
  Mazy authored Nov 21, 2020
```
Conflicts:
	GYDemo/GYDemo/Network/CGNetworkTools.h
```
  c8b38b14
- add rule alert view · eb3bb039
  Mazy authored Nov 21, 2020
  
  eb3bb039
- 修改动画 · d01a7859
  zhangshuai authored Nov 21, 2020
  
  d01a7859
- 优化广告相应速度代码 · 49880c14
  zhangshuai authored Nov 21, 2020
  
  49880c14
- 注释调试信息 · e1ff4d76
  zhangshuai authored Nov 21, 2020
```
删掉没用的代码
封装一清除广告对象的方法
```
  e1ff4d76
20 Nov, 2020 12 commits
- 增加动画 · 99f97c44
  zhangshuai authored Nov 20, 2020
  
  99f97c44
- 修改配置 · 053f2fa1
  zhangshuai authored Nov 20, 2020
  
  053f2fa1
- Merge remote-tracking branch 'refs/remotes/origin/master' · 85bff1f1
  Mazy authored Nov 20, 2020
  
  85bff1f1
- optimize code · c4ced2ab
  Mazy authored Nov 20, 2020
  
  c4ced2ab
- 修改冲突 · bd403b89
  zhangshuai authored Nov 20, 2020
  
  bd403b89
- 内容 · 8b05af81
  zhangshuai authored Nov 20, 2020
  
  8b05af81
- 找回代码 · 982d47cb
  zhangshuai authored Nov 20, 2020
  
  982d47cb
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · e20e4dbb
  zhangshuai authored Nov 20, 2020
```
# Conflicts:
#	GYDemo/GYDemo.xcodeproj/project.pbxproj
#	GYDemo/GYDemo/AppDelegate.mm
```
  e20e4dbb
- 修改福利中心 · 6353e428
  zhangshuai authored Nov 20, 2020
  
  6353e428
- add ranking view · 417178a5
  Mazy authored Nov 20, 2020
  
  417178a5
- 修改配置 · ca3c6021
  zhangshuai authored Nov 20, 2020
  
  ca3c6021
- feat: add ranking list · 02330ed2
  Mazy authored Nov 20, 2020
  
  02330ed2
19 Nov, 2020 1 commit
- 修改福利中心为原生 · 01f32ebc
  zhangshuai authored Nov 19, 2020
  
  01f32ebc
18 Nov, 2020 14 commits
- change api · e8334ec9
  Mazy authored Nov 18, 2020
  
  e8334ec9
- Merge remote-tracking branch 'refs/remotes/origin/master' · 5d9a9be2
  Mazy authored Nov 18, 2020
  
  5d9a9be2
- 修改配置 · 80c36689
  zhangshuai authored Nov 18, 2020
  
  80c36689
- fix bugs · 72bbfc2e
  Mazy authored Nov 18, 2020
  
  72bbfc2e
- fix login bugs · 99bb152b
  Mazy authored Nov 18, 2020
  
  99bb152b
- change unity project · bad9a72e
  Mazy authored Nov 18, 2020
  
  bad9a72e
- change api · 3c491416
  Mazy authored Nov 18, 2020
  
  3c491416
- Merge remote-tracking branch 'refs/remotes/origin/master' · c83445df
  Mazy authored Nov 18, 2020
  
  c83445df
- 默认数据 · 323e32c8
  zhangshuai authored Nov 18, 2020
  
  323e32c8
- 增加策划返回修改增加默认数据 · 8fd4e598
  zhangshuai authored Nov 18, 2020
  
  8fd4e598
- update unity project · cc6bddec
  Mazy authored Nov 18, 2020
  
  cc6bddec
- Merge remote-tracking branch 'refs/remotes/origin/master' · 279e23dd
  Mazy authored Nov 18, 2020
```
Conflicts:
	GYDemo/GYDemo.xcodeproj/project.pbxproj
```
  279e23dd
- update unity project · 593e5b0a
  Mazy authored Nov 18, 2020
  
  593e5b0a
- 部分元修改为钻 · d8f64bb6
  zhangshuai authored Nov 18, 2020
  
  d8f64bb6