vylion/skeleton-wars
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added necromancer prefabs to unitCreator

Browse source
This commit is contained in:
vylion 2016-10-30 15:37:15 +01:00
parent ed14ef0112
commit 4a3a33ba19
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Assets/3rdParty/Necromancer/Prefab/Necromancer.prefab vendored
View file

@ -717,11 +717,7 @@ GameObject:
m_Component: m_Component:
- 4: {fileID: 400094} - 4: {fileID: 400094}
- 111: {fileID: 11100000} - 111: {fileID: 11100000}
<<<<<<< HEAD
- 114: {fileID: 114000010571928154}
=======
- 114: {fileID: 114000011327575330} - 114: {fileID: 114000011327575330}
>>>>>>> 501dcfa86cfa6fdebafb6de0f259d19bad303f69
m_Layer: 0 m_Layer: 0
m_Name: Necromancer m_Name: Necromancer
m_TagString: Untagged m_TagString: Untagged
@ -1558,11 +1554,7 @@ Prefab:
m_ParentPrefab: {fileID: 0} m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100094} m_RootGameObject: {fileID: 100094}
m_IsPrefabParent: 1 m_IsPrefabParent: 1
<<<<<<< HEAD
--- !u!114 &114000010571928154
=======
--- !u!114 &114000011327575330 --- !u!114 &114000011327575330
>>>>>>> 501dcfa86cfa6fdebafb6de0f259d19bad303f69
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}