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

Modification of assets and creation of MikeScene.

Browse Source
This commit is contained in:
Marc-Antoine Dumont 2015-08-13 15:06:03 -04:00
parent 92a3f7b270
commit 47f8963dab
15 changed files with 11683 additions and 8279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/Scene/GameBoard.unity
View File

@ -476,7 +476,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: e105c9c716b637945b393dd706a12c51, type: 3}
m_Sprite: {fileID: 21300000, guid: aa9977d756cc31f4f99882795938d5ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1301,7 +1301,7 @@ RectTransform:
- {fileID: 1873224223}
- {fileID: 51049972}
m_Father: {fileID: 1660519659}
m_RootOrder: 5
m_RootOrder: 6
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
@ -2239,10 +2239,10 @@ RectTransform:
m_Children:
- {fileID: 1710833198}
m_Father: {fileID: 1660519659}
m_RootOrder: 7
m_RootOrder: 2
m_AnchorMin: {x: .5, y: .5}
m_AnchorMax: {x: .5, y: .5}
m_AnchoredPosition: {x: -76.5, y: -2.5}
m_AnchoredPosition: {x: 219, y: -93}
m_SizeDelta: {x: 67.0999985, y: 23.2999992}
m_Pivot: {x: .5, y: .5}
--- !u!114 &814659596
@ -2760,7 +2760,7 @@ RectTransform:
- {fileID: 445496035}
- {fileID: 893219176}
m_Father: {fileID: 1660519659}
m_RootOrder: 6
m_RootOrder: 7
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
@ -3189,7 +3189,7 @@ RectTransform:
- {fileID: 365580343}
- {fileID: 1848076642}
m_Father: {fileID: 1660519659}
m_RootOrder: 2
m_RootOrder: 3
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
@ -3226,7 +3226,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .39199999}
m_Sprite: {fileID: 21300000, guid: 967804323e6c1ee48adac38aa69c71c2, type: 3}
m_Sprite: {fileID: 21300000, guid: ce975a919c84b9b45ac7ea2f3cca8419, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3612,7 +3612,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: e105c9c716b637945b393dd706a12c51, type: 3}
m_Sprite: {fileID: 21300000, guid: aa9977d756cc31f4f99882795938d5ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3851,7 +3851,7 @@ GameObject:
- 222: {fileID: 1410417525}
- 114: {fileID: 1410417524}
m_Layer: 5
m_Name: Lumber Log
m_Name: Ressource Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -3889,7 +3889,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: 7c4cb422c3b74134ebe4065b3f730558, type: 3}
m_Sprite: {fileID: 21300000, guid: 73aa87cf69a8e0e4ebeb3a297f854304, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4293,7 +4293,7 @@ RectTransform:
- {fileID: 1364715792}
- {fileID: 1519905739}
m_Father: {fileID: 1660519659}
m_RootOrder: 3
m_RootOrder: 4
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
@ -4580,7 +4580,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: e105c9c716b637945b393dd706a12c51, type: 3}
m_Sprite: {fileID: 21300000, guid: aa9977d756cc31f4f99882795938d5ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4679,12 +4679,12 @@ RectTransform:
m_Children:
- {fileID: 1402754311}
- {fileID: 1768291261}
- {fileID: 814659595}
- {fileID: 1108311137}
- {fileID: 1529662981}
- {fileID: 1891756158}
- {fileID: 370686603}
- {fileID: 876236262}
- {fileID: 814659595}
- {fileID: 1877267735}
m_Father: {fileID: 0}
m_RootOrder: 5
@ -4808,7 +4808,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: 7c4cb422c3b74134ebe4065b3f730558, type: 3}
m_Sprite: {fileID: 21300000, guid: d3f87475ef824414d9da6675bb8dde47, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -5910,7 +5910,7 @@ RectTransform:
- {fileID: 1910731123}
- {fileID: 1746498160}
m_Father: {fileID: 1660519659}
m_RootOrder: 4
m_RootOrder: 5
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}

13412
Assets/Scene/MAScene.unity
View File

File diff suppressed because it is too large Load Diff

6443
Assets/Scene/MikeScene.unity Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Scene/MikeScene.unity.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3bacd42736b9b75418b7fd12379e8064
timeCreated: 1439492684
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sprite/LumberBorder.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Assets/Sprite/Meat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

4
Assets/Sprite/LumberBorder.jpg.meta → Assets/Sprite/Meat.png.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 967804323e6c1ee48adac38aa69c71c2
timeCreated: 1439408872
guid: 73aa87cf69a8e0e4ebeb3a297f854304
timeCreated: 1439492217
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}

BIN
Assets/Sprite/WoodFrame.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

4
Assets/Sprite/lumberLog.jpg.meta → Assets/Sprite/WoodFrame.png.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7c4cb422c3b74134ebe4065b3f730558
timeCreated: 1439409065
guid: ce975a919c84b9b45ac7ea2f3cca8419
timeCreated: 1439492252
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}

BIN
Assets/Sprite/lumberLog.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.1 KiB

BIN
Assets/Sprite/lumberLog.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 KiB

55
Assets/Sprite/lumberLog.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: d3f87475ef824414d9da6675bb8dde47
timeCreated: 1439492116
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sprite/plus.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 44 KiB

4
Assets/Sprite/plus.png.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e105c9c716b637945b393dd706a12c51
timeCreated: 1439408366
guid: aa9977d756cc31f4f99882795938d5ab
timeCreated: 1439492200
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}

2
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 5.1.1f1
m_EditorVersion: 5.1.2f1
m_StandardAssetsVersion: 0