Commits · v1.0.1 · lmj / LuckFarm

28 Oct, 2020 6 commits
- x · 95a2e683
  Mazy authored Oct 28, 2020
  
  95a2e683
- add v1.0.1 · 02729795
  Mazy authored Oct 28, 2020
  
  02729795
- change unity ios project · 71274e14
  Mazy authored Oct 28, 2020
  
  71274e14
- merge code · a57c5cb4
  Mazy authored Oct 28, 2020
  
  a57c5cb4
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 8ce70344
  Mazy authored Oct 28, 2020
  
  8ce70344
- ! · 1f08a141
  Mazy authored Oct 28, 2020
  
  1f08a141
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 22 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
- DrawOrder · c8928867
  lmj_521aiau@163.com authored Oct 23, 2020
  
  c8928867
- no message · 8c5e4cba
  lmj_521aiau@163.com authored Oct 23, 2020
  
  8c5e4cba
- appdelegate taskAlertView · 3acdf00c
  lmj_521aiau@163.com authored Oct 23, 2020
  
  3acdf00c
- icon · db97190e
  lmj_521aiau@163.com authored Oct 23, 2020
  
  db97190e
- no message · 872cd0cf
  lmj_521aiau@163.com authored Oct 23, 2020
  
  872cd0cf
- box webVC · f94730fe
  lmj_521aiau@163.com authored Oct 23, 2020
  
  f94730fe
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · aaad9fcf
  lmj_521aiau@163.com authored Oct 23, 2020
  
  aaad9fcf
- no message · 3986359a
  lmj_521aiau@163.com authored Oct 23, 2020
  
  3986359a
- x · c397a51d
  Mazy authored Oct 23, 2020
  
  c397a51d
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · 8b5031a6
  Mazy authored Oct 23, 2020
  
  8b5031a6
- s · d26d8e3d
  Mazy authored Oct 23, 2020
  
  d26d8e3d
- Delete .DS_Store · bef5997c
  Ma authored Oct 23, 2020
  
  bef5997c
- Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm · ae400570
  Mazy authored Oct 23, 2020
  
  ae400570
- add gitignore · 1c576bdf
  Mazy authored Oct 23, 2020
  
  1c576bdf
- no message · 2a795c4b
  lmj_521aiau@163.com authored Oct 23, 2020
  
  2a795c4b
- workplace · 59b64f1b
  lmj_521aiau@163.com authored Oct 23, 2020
  
  59b64f1b
- 1.0.0 fix ui · 76679d2c
  lmj_521aiau@163.com authored Oct 23, 2020
  
  76679d2c
22 Oct, 2020 2 commits
- delete ads · 8e6a7178
  lmj_521aiau@163.com authored Oct 22, 2020
  
  8e6a7178
- LuckFarm · d943a679
  lmj_521aiau@163.com authored Oct 22, 2020
  
  d943a679