Commits · 85bff1f18395a4d663086d9ae3475a8ab0de903b · lmj / LuckFarm

20 Nov, 2020 10 commits
- 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 17 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
- 增加原生的福利中心 · a71b1bb8
  zhangshuai authored Nov 18, 2020
  
  a71b1bb8
- update unity project · 341e4045
  Mazy authored Nov 18, 2020
  
  341e4045
- 增加接口修改 · 75e504ab
  zhangshuai authored Nov 18, 2020
  
  75e504ab
17 Nov, 2020 1 commit
- 优化开屏广告速度 · 898f66ad
  zhangshuai authored Nov 17, 2020
  
  898f66ad
16 Nov, 2020 11 commits
- optimize webView · ccd30775
  Mazy authored Nov 16, 2020
  
  ccd30775
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 8ce7fcf3
  zhangshuai authored Nov 16, 2020
  
  8ce7fcf3
- 修改超时 · 37c09aa4
  zhangshuai authored Nov 16, 2020
  
  37c09aa4
- optimize webview resume acition · f69a3c29
  Mazy authored Nov 16, 2020
  
  f69a3c29
- Merge remote-tracking branch 'refs/remotes/origin/master' · bfb48028
  Mazy authored Nov 16, 2020
  
  bfb48028
- fix withdraw bugs · 57a38c6d
  Mazy authored Nov 16, 2020
  
  57a38c6d
- 删除没用的代码 · 0fd68957
  zhangshuai authored Nov 16, 2020
  
  0fd68957
- 优化加载时间 · fb579ac5
  zhangshuai authored Nov 16, 2020
  
  fb579ac5
- 修改后置缓存 · 5e06b70a
  zhangshuai authored Nov 16, 2020
  
  5e06b70a
- bug · 2c2dcef3
  zhangshuai authored Nov 16, 2020
  
  2c2dcef3
- Merge remote-tracking branch 'refs/remotes/origin/master' · 6f9c574f
  Mazy authored Nov 16, 2020
  
  6f9c574f