Commits · 8d15d6bf3397dda9d2dfec1767cdf1492cfc6985 · wanqing / SteelBall

26 Jan, 2021 1 commit
- 关卡逻辑修改 · 8d15d6bf
  wanqing authored Jan 26, 2021
  
  8d15d6bf
25 Jan, 2021 5 commits
- 脚本优化 · c6d19620
  wanqing authored Jan 25, 2021
  
  c6d19620
- 材质优化 · 9346c493
  wanqing authored Jan 25, 2021
  
  9346c493
- 关卡优化 · 3237868a
  wanqing authored Jan 25, 2021
  
  3237868a
- Merge remote-tracking branch 'origin/YuYang' · 593df03a
  wanqing authored Jan 25, 2021
```
# Conflicts:
#	SteelBall/Assets/Res/Prefabs/Levels/Level06.prefab
```
  593df03a
- 于:第六关修改 · 5e4907a1
  Yuyang authored Jan 25, 2021
  
  5e4907a1
23 Jan, 2021 4 commits
- tag设置 · 84f4e15a
  wanqing authored Jan 23, 2021
  
  84f4e15a
- 修改bug · f1a4b0b7
  wanqing authored Jan 23, 2021
  
  f1a4b0b7
- 脚本优化 · 0fa55877
  wanqing authored Jan 23, 2021
  
  0fa55877
- 爆破插件升级 · b9ec4809
  wanqing authored Jan 23, 2021
  
  b9ec4809
22 Jan, 2021 9 commits
- 新关卡逻辑 · b3c6396d
  wanqing authored Jan 22, 2021
  
  b3c6396d
- Merge remote-tracking branch 'origin/YuYang' · 1e493274
  wanqing authored Jan 22, 2021
  
  1e493274
- 于:第6关 · d78184b8
  Yuyang authored Jan 22, 2021
  
  d78184b8
- Merge remote-tracking branch 'origin/YuYang' · 2e1819e1
  wanqing authored Jan 22, 2021
  
  2e1819e1
- 于:修正 · e111286e
  Yuyang authored Jan 22, 2021
  
  e111286e
- Merge remote-tracking branch 'origin/YuYang' · 098d6042
  wanqing authored Jan 22, 2021
  
  098d6042
- 于:第6关修改 · db78b37d
  Yuyang authored Jan 22, 2021
  
  db78b37d
- Merge remote-tracking branch 'origin/YuYang' · 8d715453
  wanqing authored Jan 22, 2021
  
  8d715453
- 于:第6关提交 · e08aa3d6
  Yuyang authored Jan 22, 2021
  
  e08aa3d6
21 Jan, 2021 4 commits
- 新关卡逻辑修改 · f9c7b00d
  wanqing authored Jan 21, 2021
  
  f9c7b00d
- 于:提交关卡 · 1198edbe
  Yuyang authored Jan 21, 2021
  
  1198edbe
- 于:新关卡上传 · c6a175aa
  Yuyang authored Jan 21, 2021
  
  c6a175aa
- 于:新关卡素材 · 265d8ef1
  Yuyang authored Jan 21, 2021
  
  265d8ef1
20 Jan, 2021 4 commits
- 场景box材质替换 · c34d5757
  wanqing authored Jan 20, 2021
  
  c34d5757
- 修改BattleUI · 6d75d6d6
  wanqing authored Jan 20, 2021
  
  6d75d6d6
- 隐藏UI录屏模式功能 · 53b614da
  wanqing authored Jan 20, 2021
  
  53b614da
- 铁球移动方块bug修改 · 801081bb
  wanqing authored Jan 20, 2021
  
  801081bb
18 Jan, 2021 1 commit
- 增加移动速度，铁球重量调试系数 · 5c648621
  wanqing authored Jan 18, 2021
  
  5c648621
15 Jan, 2021 7 commits
- 增加新关卡 · 4e950c9a
  wanqing authored Jan 15, 2021
  
  4e950c9a
- Merge remote-tracking branch 'origin/YuYang' · 5cb4b927
  wanqing authored Jan 15, 2021
```
# Conflicts:
#	SteelBall/Assets/Res/Prefabs/Levels/Level05.prefab
```
  5cb4b927
- 于:破碎优化 · 724876ae
  Yuyang authored Jan 15, 2021
  
  724876ae
- Merge remote-tracking branch 'origin/YuYang' · 223fbbf8
  wanqing authored Jan 15, 2021
  
  223fbbf8
- 于:破碎插件,破碎场景添加 · 5c7f2a69
  Yuyang authored Jan 15, 2021
  
  5c7f2a69
- 工程设置更改 · dabb726d
  wanqing authored Jan 15, 2021
  
  dabb726d
- 阻挡碰撞盒，铁链物理碰撞 · 2b1c2dc7
  wanqing authored Jan 15, 2021
  
  2b1c2dc7
14 Jan, 2021 5 commits
- 第五关卡优化 · d47ca545
  wanqing authored Jan 14, 2021
  
  d47ca545
- 修改不能打包问题 · a3a5073f
  wanqing authored Jan 14, 2021
  
  a3a5073f
- 关卡提交 · 70f44d37
  wanqing authored Jan 14, 2021
  
  70f44d37
- 于:3-5关卡修正 · 2edde043
  Yuyang authored Jan 14, 2021
  
  2edde043
- Merge remote-tracking branch 'origin/master' into YuYang · a1e5e9c6
  Yuyang authored Jan 14, 2021
```
# Conflicts:
#	SteelBall/Assets/Res/Prefabs/Levels/Level03.prefab
#	SteelBall/Assets/Res/Prefabs/Levels/Level04.prefab
```
  a1e5e9c6