Commits · Yuy · wanqing / Storage

08 Apr, 2021 2 commits
- Merge remote-tracking branch 'origin/master' into Yuy · ec902237
  Yuyang authored Apr 08, 2021
  
  ec902237
- 于:第3关修改 · fd95bf9c
  Yuyang authored Apr 08, 2021
  
  fd95bf9c
07 Apr, 2021 2 commits
- logo替换 · 24489d54
  wanqing authored Apr 07, 2021
  
  24489d54
- 修改抖动问题 · 265799a7
  wanqing authored Apr 07, 2021
  
  265799a7
06 Apr, 2021 9 commits
- 修改代码 · 6c474e72
  wanqing authored Apr 06, 2021
  
  6c474e72
- 修改场景预制体 · 431a61e0
  wanqing authored Apr 06, 2021
  
  431a61e0
- 修改脚本 · da67cfae
  wanqing authored Apr 06, 2021
  
  da67cfae
- 鬼畜问题 · 9b65694b
  wanqing authored Apr 06, 2021
  
  9b65694b
- 增加z轴限制 · 0e97c63e
  wanqing authored Apr 06, 2021
  
  0e97c63e
- 修改Ui · 4576e969
  wanqing authored Apr 06, 2021
  
  4576e969
- 一直显红代码优化 · bdbca7ee
  wanqing authored Apr 06, 2021
  
  bdbca7ee
- 优化碰撞 · 5f1608c0
  wanqing authored Apr 06, 2021
  
  5f1608c0
- 于:第二第三关提交 · 28f02e4a
  Yuyang authored Apr 06, 2021
  
  28f02e4a
02 Apr, 2021 12 commits
- 于:关卡修复 · 24ddf61a
  Yuyang authored Apr 02, 2021
  
  24ddf61a
- 于:物体物体效果调整 · e6aa4300
  Yuyang authored Apr 02, 2021
  
  e6aa4300
- 材质 · 97db2f8f
  wanqing authored Apr 02, 2021
  
  97db2f8f
- 添加物理材料 · d2ed0770
  wanqing authored Apr 02, 2021
  
  d2ed0770
- 修改场景预制体 · 628239eb
  wanqing authored Apr 02, 2021
  
  628239eb
- Merge remote-tracking branch 'origin/Yuy' · b4637d4e
  wanqing authored Apr 02, 2021
```
# Conflicts:
#	Storage/Assets/Res/Levels/Level8.prefab
#	Storage/Assets/Res/Levels/Level9.prefab
```
  b4637d4e
- 于:动画调整 · 2997a09a
  Yuyang authored Apr 02, 2021
  
  2997a09a
- 于:碰撞盒修改 · ebbdcf20
  Yuyang authored Apr 02, 2021
  
  ebbdcf20
- 修改场景预制体 · 9aed172b
  wanqing authored Apr 02, 2021
  
  9aed172b
- 修改预制体 · 27c15ab9
  wanqing authored Apr 02, 2021
  
  27c15ab9
- 插件导入 · 27549606
  wanqing authored Apr 02, 2021
  
  27549606
- 于:碰撞盒插件 · caf4836d
  Yuyang authored Apr 02, 2021
  
  caf4836d
01 Apr, 2021 15 commits
- 于:第6/7关动画修改 · b4c58b08
  Yuyang authored Apr 01, 2021
  
  b4c58b08
- 修改场景预制体 · 45f4f49a
  wanqing authored Apr 01, 2021
  
  45f4f49a
- 于:第3关难度降低 · 62dd8184
  Yuyang authored Apr 01, 2021
  
  62dd8184
- 于:第8/9关预制体冲突重新提交 · ee438270
  Yuyang authored Apr 01, 2021
  
  ee438270
- Merge remote-tracking branch 'origin/master' into Yuy · 01864399
  Yuyang authored Apr 01, 2021
  
  01864399
- 于:第8/9关袋子显示问题修正 · 6c9e7a11
  Yuyang authored Apr 01, 2021
  
  6c9e7a11
- 修改预制体 · accc0b1b
  wanqing authored Apr 01, 2021
  
  accc0b1b
- 修改预制体 · 017d66e6
  wanqing authored Apr 01, 2021
  
  017d66e6
- 于:第8/9失败动画修正 · eeba072b
  Yuyang authored Apr 01, 2021
  
  eeba072b
- 于:第6/7关动画调整 · 137c3828
  Yuyang authored Apr 01, 2021
  
  137c3828
- Merge remote-tracking branch 'origin/master' into Yuy · 547ecd94
  Yuyang authored Apr 01, 2021
  
  547ecd94
- 于:第8/9关调整 · 60126d56
  Yuyang authored Apr 01, 2021
  
  60126d56
- 修改代码 · 0a4a7489
  wanqing authored Apr 01, 2021
  
  0a4a7489
- 修改场景预制体 · e334df9a
  wanqing authored Apr 01, 2021
  
  e334df9a
- Merge remote-tracking branch 'origin/Yuy' · 98816790
  wanqing authored Apr 01, 2021
```
# Conflicts:
#	Storage/Assets/Res/Levels/Level8.prefab
```
  98816790