Merge remote-tracking branch 'origin/YuYang'

# Conflicts: # BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab # BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta

Merge remote-tracking branch 'origin/YuYang'
# Conflicts: # BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab # BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta
024835ba · wanqing · 5b71c148 · 8ea770ba · 024835ba · 024835ba
Commit 024835ba authored Mar 04, 2021 by wanqing
Expand all Show whitespace changes
Inline Side-by-side

Showing with 4923 additions and 4022 deletions

Level8.prefab BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab +4922 -4021

Level8.prefab.meta BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta +1 -1

No files found.
--- a/BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
+++ b/BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
--- a/BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta
+++ b/BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta
 fileFormatVersion: 2
-guid: 3f09d12529498434a9537047f0c48315
+guid: 31f084bd887ce134099cf3e3a2d8fdfe
 PrefabImporter:
  externalObjects: {}
  userData: