Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

restored broken prefabs

Browse Source
This commit is contained in:
craftwill 2023-07-23 16:26:27 -04:00
parent 7de3727297
commit 8b13efe012
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
View File

@ -106,7 +106,7 @@ BoxCollider2D:
m_Enabled: 1 m_Enabled: 1
m_Density: 1 m_Density: 1
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 1 m_IsTrigger: 0
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
@ -577,10 +577,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_entity: {fileID: 313037212318601125} _entity: {fileID: 313037212318601125}
_projectile: {fileID: 0} _projectile: {fileID: 0}
<<<<<<< HEAD
=======
_projectileSpawn: {fileID: 0} _projectileSpawn: {fileID: 0}
>>>>>>> 15f95d5bc42cf539dec3594a03d46606fe9ae84f
--- !u!1 &1776168629768863343 --- !u!1 &1776168629768863343
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

5
Assets/Prefabs/Sticks/baseStick.prefab
View File

@ -511,7 +511,7 @@ BoxCollider2D:
m_Enabled: 1 m_Enabled: 1
m_Density: 1 m_Density: 1
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 1 m_IsTrigger: 0
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
@ -749,10 +749,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_entity: {fileID: 8585520847943034727} _entity: {fileID: 8585520847943034727}
_projectile: {fileID: 0} _projectile: {fileID: 0}
<<<<<<< HEAD:Assets/Prefabs/baseStick.prefab
=======
_projectileSpawn: {fileID: 0} _projectileSpawn: {fileID: 0}
>>>>>>> 15f95d5bc42cf539dec3594a03d46606fe9ae84f:Assets/Prefabs/Sticks/baseStick.prefab
--- !u!1 &6962989255885988245 --- !u!1 &6962989255885988245
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0