Commits · 126ad19bfb4b5e526cf4f58ec7dd2195cc3a3ccc · 王雪伟 / LuckyFarm

30 Nov, 2020 1 commit

wangxuewei authored Nov 30, 2020

[提交简述] ：多多花园1.0.0
[实现方案] ：花园提交审核包，替换接口参数为菜园参数

126ad19b

26 Nov, 2020 3 commits
- [提交人]：王雪伟 · 7f9e72be
  wangxuewei authored Nov 26, 2020
```
[提交简述] ：多多花园1.0.0
[实现方案] ：菜园换皮 更换为1.0.0
```
  7f9e72be
- [提交人]：王雪伟 · 65669fd8
  wangxuewei authored Nov 26, 2020
```
[提交简述] ：多多菜园开发1.0.6版本
[实现方案] ：创建分支升级版本
```
  65669fd8
- 多多菜园1.0.5最新代码 · 49c8c9fb
  maxiaoliang authored Nov 26, 2020
  
  49c8c9fb
25 Nov, 2020 5 commits
- 多多菜园1.0.4最新代码 · a1be66b5
  maxiaoliang authored Nov 25, 2020
  
  a1be66b5
- Merge remote-tracking branch 'origin/develop_ddcy_1.0.4' into develop_ddcy_1.0.4 · 5f9ca87f
  Li authored Nov 25, 2020
  
  5f9ca87f
- [李俊岐] 优化上报 · 8d4ab55d
  Li authored Nov 25, 2020
  
  8d4ab55d
- [提交人]：王雪伟 · cfffec90
  wangxuewei authored Nov 25, 2020
```
[提交简述] ：多多菜园
[实现方案] ：修改看视频领加速剂回调时机
```
  cfffec90
- 多多菜园1.0.3上线 · b2869b84
  maxiaoliang authored Nov 25, 2020
  
  b2869b84
24 Nov, 2020 11 commits
- [李俊岐] 优化 · 0a538ec2
  Li authored Nov 24, 2020
  
  0a538ec2
- [李俊岐] 优化 · 2d3662d6
  Li authored Nov 24, 2020
  
  2d3662d6
- [李俊岐] 优化 · 0a0f9cef
  Li authored Nov 24, 2020
  
  0a0f9cef
- 111 · 1dee3bfe
  maxiaoliang authored Nov 24, 2020
  
  1dee3bfe
- [李俊岐] 优化 · a9f7fc28
  Li authored Nov 24, 2020
  
  a9f7fc28
- 111 · 427a76d3
  maxiaoliang authored Nov 24, 2020
  
  427a76d3
- 111 · d4e2fdc3
  maxiaoliang authored Nov 24, 2020
  
  d4e2fdc3
- [李俊岐] 优化 · 81ffe548
  Li authored Nov 24, 2020
  
  81ffe548
- [李俊岐] 优化 · 667c3353
  Li authored Nov 24, 2020
  
  667c3353
- 修改启动页和其他ui · 7c677cbb
  maxiaoliang authored Nov 24, 2020
  
  7c677cbb
- [李俊岐] 优化 · bd9edfa7
  Li authored Nov 24, 2020
  
  bd9edfa7
23 Nov, 2020 7 commits
- 修改任务完成后领取接口 · a4ed5af4
  maxiaoliang authored Nov 23, 2020
  
  a4ed5af4
- 修改任务列表逻辑，添加金币音效 · 8e3fc437
  maxiaoliang authored Nov 23, 2020
  
  8e3fc437
- [李俊岐] 优化 · 8488af22
  Li authored Nov 23, 2020
  
  8488af22
- [李俊岐] 优化上报 · f8667c54
  Li authored Nov 23, 2020
  
  f8667c54
- [李俊岐] 修改福利中心ui · f419b8fe
  Li authored Nov 23, 2020
  
  f419b8fe
- 修改广告 · cd3ed079
  maxiaoliang authored Nov 23, 2020
  
  cd3ed079
- Merge branch 'develop_ddcy_1.0.3' of gitlab.huolea.com:wangxuewei/luckyfarm into develop_ddcy_1.0.3 · 57cd722a
  maxiaoliang authored Nov 23, 2020
```
# Conflicts:
#	game/src/main/assets/bin/Data/Managed/UnityGameFramework.Runtime.dll
#	game/src/main/assets/bin/Data/sharedassets1.assets.split42
#	game/src/main/assets/bin/Data/sharedassets1.assets.split43
#	game/src/main/assets/bin/Data/sharedassets1.assets.split44
#	game/src/main/assets/bin/Data/sharedassets1.assets.split45
#	game/src/main/assets/bin/Data/sharedassets1.assets.split46
```
  57cd722a
21 Nov, 2020 12 commits
- Merge branch 'develop_ddcy_1.0.3' of gitlab.huolea.com:wangxuewei/luckyfarm into develop_ddcy_1.0.3 · 84b75b57
  maxiaoliang authored Nov 21, 2020
```
# Conflicts:
#	game/src/main/assets/bin/Data/Managed/UnityGameFramework.Runtime.dll
#	game/src/main/assets/bin/Data/sharedassets1.assets.split42
#	game/src/main/assets/bin/Data/sharedassets1.assets.split43
#	game/src/main/assets/bin/Data/sharedassets1.assets.split44
#	game/src/main/assets/bin/Data/sharedassets1.assets.split45
#	game/src/main/assets/bin/Data/sharedassets1.assets.split46
```
  84b75b57
- fix merge · 2e636967
  maxiaoliang authored Nov 21, 2020
  
  2e636967
- 恢复代码 · 6cbd4fa2
  maxiaoliang authored Nov 21, 2020
  
  6cbd4fa2
- [提交人]：王雪伟 · 15a45152
  wangxuewei authored Nov 21, 2020
```
[提交简述] ：多多菜园1.0.3
[实现方案] ：游戏代码
```
  15a45152
- Merge remote-tracking branch 'origin/develop_ddcy_1.0.3' into develop_ddcy_1.0.3 · 1041532e
  wangxuewei authored Nov 21, 2020
  
  1041532e
- [提交人]：王雪伟 · 95f6d286
  wangxuewei authored Nov 21, 2020
```
[提交简述] ：多多菜园1.0.3
[实现方案] ：回调改为上报
```
  95f6d286
- [提交人]：王雪伟 · a04188c2
  wangxuewei authored Nov 21, 2020
```
[提交简述] ：多多菜园1.0.3
[实现方案] ：回调改为上报
```
  a04188c2
- [李俊岐] 修复转盘崩溃 · e3bb496f
  Li authored Nov 21, 2020
  
  e3bb496f
- 修改ui · e45482b1
  maxiaoliang authored Nov 21, 2020
  
  e45482b1
- [提交人]：王雪伟 · 95115459
  wangxuewei authored Nov 21, 2020
```
[提交简述] ：多多菜园1.0.3
[实现方案] ：更换游戏资源
```
  95115459
- Merge remote-tracking branch 'origin/develop_ddcy_1.0.3' into develop_ddcy_1.0.3 · a2343181
  wangxuewei authored Nov 21, 2020
  
  a2343181
- [提交人]：王雪伟 · 5accde50
  wangxuewei authored Nov 21, 2020
```
[提交简述] ：多多菜园1.0.3
[实现方案] ：更换游戏资源
```
  5accde50
20 Nov, 2020 1 commit
- [李俊岐] 优化 · fbadc28a
  Li authored Nov 20, 2020
  
  fbadc28a