Conjure/Human-Farm-Tycoon
6
0
Fork 0
mirror of https://github.com/ConjureETS/Human-Farm-Tycoon.git synced 2026-03-24 02:11:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon

Browse Source
This commit is contained in:
Marc-Antoine Dumont 2015-08-14 11:06:08 -04:00
commit 3bed6f6f84
2 changed files with 10823 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Prefabs/Champ.prefab
View File

@ -51,7 +51,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 1 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 037b2c8debd03e345aea34d98487d613, type: 3} m_Sprite: {fileID: 21300000, guid: 037b2c8debd03e345aea34d98487d613, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000 --- !u!1001 &100100000
@ -60,7 +60,11 @@ Prefab:
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: [] m_Modifications:
- target: {fileID: 0}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 0} m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 144572} m_RootGameObject: {fileID: 144572}

10902
Assets/Scene/AntoineScene.unity
View File

File diff suppressed because it is too large Load Diff