Commits · 945a1a2299e6a33d0680c2f2413308070b1a6067 · wanqing / BoomMaster

09 Feb, 2021 23 commits
- Merge commit 'aa0011f0' · 945a1a22
  wanqing authored Feb 09, 2021
```
# Conflicts:
#	BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
```
  945a1a22
- ui调整 · aa0011f0
  xujr authored Feb 09, 2021
  
  aa0011f0
- 修改逻辑 · 96d8acd9
  wanqing authored Feb 09, 2021
  
  96d8acd9
- 资源位置调整 · 6ff7470f
  xujr authored Feb 09, 2021
  
  6ff7470f
- 新增炸弹3 · ec997f8d
  xujr authored Feb 09, 2021
  
  ec997f8d
- 修改代码 · 36ce342d
  wanqing authored Feb 09, 2021
  
  36ce342d
- Merge remote-tracking branch 'origin/xjr' · b10d31f7
  wanqing authored Feb 09, 2021
  
  b10d31f7
- 难度减小 · dee7da23
  xujr authored Feb 09, 2021
  
  dee7da23
- 修改逻辑 · c3a5c6ee
  wanqing authored Feb 09, 2021
  
  c3a5c6ee
- 关卡调整 · 377386aa
  xujr authored Feb 09, 2021
  
  377386aa
- UI修改 · ee408354
  xujr authored Feb 09, 2021
  
  ee408354
- 修改界面 · 9742ca65
  wanqing authored Feb 09, 2021
  
  9742ca65
- Merge remote-tracking branch 'origin/xjr' · 2c86f21c
  wanqing authored Feb 09, 2021
  
  2c86f21c
- 优化 · 76329d62
  xujr authored Feb 09, 2021
  
  76329d62
- Merge commit 'eac7739f ' · 70c3e096
  wanqing authored Feb 09, 2021
  
  70c3e096
- Merge remote-tracking branch 'origin/master' into xjr · d6fc2dbe
  xujr authored Feb 09, 2021
  
  d6fc2dbe
- UI，炸弹效果调整 · eac7739f
  xujr authored Feb 09, 2021
  
  eac7739f
- 装了炸弹界面消失，爆破结束出现界面 · 1081c6c6
  wanqing authored Feb 09, 2021
  
  1081c6c6
- 修改界面 · 9163f632
  wanqing authored Feb 09, 2021
  
  9163f632
- Merge remote-tracking branch 'origin/xjr' · 8d2b3e21
  wanqing authored Feb 09, 2021
```
# Conflicts:
#	BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
```
  8d2b3e21
- 修改脚本 · 135e25ad
  wanqing authored Feb 09, 2021
  
  135e25ad
- 修正 · 8ed4b7cf
  xujr authored Feb 09, 2021
  
  8ed4b7cf
- 资源更新 · 2fae8316
  xujr authored Feb 09, 2021
  
  2fae8316
08 Feb, 2021 6 commits
- 修改逻辑 · 3e0ddf6e
  wanqing authored Feb 08, 2021
  
  3e0ddf6e
- 场景和UI更新 · 317a0dfe
  xujr authored Feb 08, 2021
  
  317a0dfe
- 修改UI · e7cde521
  wanqing authored Feb 08, 2021
  
  e7cde521
- 修改ui · e65147b5
  wanqing authored Feb 08, 2021
  
  e65147b5
- UI优化 · b9b9f7fd
  xujr authored Feb 08, 2021
  
  b9b9f7fd
- 整体优化 · b5b838cb
  xujr authored Feb 08, 2021
  
  b5b838cb
07 Feb, 2021 11 commits
- 修改代码 · ad75ebc1
  wanqing authored Feb 07, 2021
  
  ad75ebc1
- 增强UI添加开启标记 · 0269731f
  xujr authored Feb 07, 2021
  
  0269731f
- 线材质调整 · 3aaad7ea
  xujr authored Feb 07, 2021
  
  3aaad7ea
- 修改场景 · abca4fa8
  wanqing authored Feb 07, 2021
  
  abca4fa8
- Merge remote-tracking branch 'origin/xjr' · 1dc07951
  wanqing authored Feb 07, 2021
  
  1dc07951
- 关卡5修正 · 66d3df68
  xujr authored Feb 07, 2021
  
  66d3df68
- Merge remote-tracking branch 'origin/xjr' · 3b7976bb
  wanqing authored Feb 07, 2021
```
# Conflicts:
#	BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
```
  3b7976bb
- 修改逻辑 · b35c6c63
  wanqing authored Feb 07, 2021
  
  b35c6c63
- 普通炸弹效果更新，添加线材质 · 172f33e6
  xujr authored Feb 07, 2021
  
  172f33e6
- Merge remote-tracking branch 'origin/master' into xjr · 60e25f63
  xujr authored Feb 07, 2021
```
# Conflicts:
#	BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
```
  60e25f63
- 增加道具选择逻辑 · a8b84035
  wanqing authored Feb 07, 2021
  
  a8b84035