Commits · ae5d34b7945aed74d6d97e46250f4efff6914a3a · wanqing / BoomMaster

05 Mar, 2021 7 commits
- 修正 · ae5d34b7
  xujr authored Mar 05, 2021
  
  ae5d34b7
- 关卡修正 · 345f8bed
  xujr authored Mar 05, 2021
  
  345f8bed
- 修改代码 · 00860cc6
  wanqing authored Mar 05, 2021
  
  00860cc6
- 关卡合并，修正 · 1fc09c3a
  xujr authored Mar 05, 2021
  
  1fc09c3a
- Merge remote-tracking branch 'origin/YuYang' into xjr · dd6f256d
  xujr authored Mar 05, 2021
```
# Conflicts:
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
#	BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab
```
  dd6f256d
- 清除滑动效果，UI调整，icon调整 · 76c4ce9b
  xujr authored Mar 05, 2021
  
  76c4ce9b
- 于:锤子动画修正第9关摄像机镜头调整 · 00b6b638
  Yuyang authored Mar 05, 2021
  
  00b6b638
04 Mar, 2021 18 commits
- 切割脚本更新，手指滑动效果添加，刀光效果添加 · 63478ea7
  xujr authored Mar 04, 2021
  
  63478ea7
- 于:道具2&3 动画修改 · 2bfbfe6a
  Yuyang authored Mar 04, 2021
  
  2bfbfe6a
- 调整金币数量 · cf5ebe91
  wanqing authored Mar 04, 2021
  
  cf5ebe91
- 修改动画 · 1ffcf381
  wanqing authored Mar 04, 2021
  
  1ffcf381
- 新关卡资源整理 · b04e2d4e
  xujr authored Mar 04, 2021
  
  b04e2d4e
- Merge remote-tracking branch 'origin/master' into YuYang · 26d68fe9
  Yuyang authored Mar 04, 2021
  
  26d68fe9
- 修改动画，场景 · 8f5e2173
  wanqing authored Mar 04, 2021
  
  8f5e2173
- Merge remote-tracking branch 'origin/master' into xjr · 0c2e5578
  xujr authored Mar 04, 2021
  
  0c2e5578
- 于:场景灯光设置 · 416a72f8
  Yuyang authored Mar 04, 2021
  
  416a72f8
- 于:道具动画上传 · 7e7d1e0e
  Yuyang authored Mar 04, 2021
  
  7e7d1e0e
- Merge remote-tracking branch 'origin/YuYang' into xjr · 7473d538
  xujr authored Mar 04, 2021
  
  7473d538
- Merge remote-tracking branch 'origin/master' into YuYang · 02358e3b
  Yuyang authored Mar 04, 2021
  
  02358e3b
- 于:动画更新 · a6923685
  Yuyang authored Mar 04, 2021
  
  a6923685
- 修改道具逻辑 · afadc60a
  wanqing authored Mar 04, 2021
  
  afadc60a
- Merge remote-tracking branch 'origin/master' into xjr · 74e8e03b
  xujr authored Mar 04, 2021
  
  74e8e03b
- Merge remote-tracking branch 'origin/YuYang' into xjr · ab781e95
  xujr authored Mar 04, 2021
```
# Conflicts:
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta
```
  ab781e95
- Merge remote-tracking branch 'origin/YuYang' · 024835ba
  wanqing authored Mar 04, 2021
```
# Conflicts:
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta
```
  024835ba
- 于:第八关场景预制体上传 · 8ea770ba
  Yuyang authored Mar 04, 2021
  
  8ea770ba
03 Mar, 2021 8 commits
- 修正 · 5b71c148
  xujr authored Mar 03, 2021
  
  5b71c148
- Merge remote-tracking branch 'origin/YuYang' into xjr · c71e6671
  xujr authored Mar 03, 2021
  
  c71e6671
- 于:关卡修改及道具动画 · a496b27b
  Yuyang authored Mar 03, 2021
  
  a496b27b
- UI调整 · 73a16770
  xujr authored Mar 03, 2021
  
  73a16770
- UI调整，新增道具图标添加 · d4247cb7
  xujr authored Mar 03, 2021
  
  d4247cb7
- 场景2缺失资源修正 · 9bc3f97c
  xujr authored Mar 03, 2021
  
  9bc3f97c
- 道具1调整 · 3b50a2d0
  xujr authored Mar 03, 2021
  
  3b50a2d0
- 添加场景1，场景2，道具1.2.3.4 · fc6b3444
  xujr authored Mar 03, 2021
  
  fc6b3444
01 Mar, 2021 1 commit
- 关卡调整 · 5468adec
  wanqing authored Mar 01, 2021
  
  5468adec
10 Feb, 2021 6 commits
- Merge remote-tracking branch 'origin/xjr' · fa83889f
  wanqing authored Feb 10, 2021
  
  fa83889f
- 优化 · 3d5fc4fd
  xujr authored Feb 10, 2021
  
  3d5fc4fd
- 替换图标 · 0be7475d
  wanqing authored Feb 10, 2021
  
  0be7475d
- Merge remote-tracking branch 'origin/master' into xjr · 6ea305a4
  xujr authored Feb 10, 2021
  
  6ea305a4
- 修改预制体 · 5ba30b8b
  wanqing authored Feb 10, 2021
  
  5ba30b8b
- Merge commit '9d95d483 ' · 54f7de68
  wanqing authored Feb 10, 2021
  
  54f7de68