Skip to content

B
BoomMaster
Commit 024835ba authored by wanqing's avatar wanqing
Browse files
Options

Merge remote-tracking branch 'origin/YuYang' 

# Conflicts:
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta
parents 5b71c148 8ea770ba
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4923 additions and 4022 deletions
BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab.meta
View file @ 024835ba
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3f09d12529498434a9537047f0c48315 guid: 31f084bd887ce134099cf3e3a2d8fdfe
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment