diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ebf2989..cb2511b 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -262,6 +262,16 @@ Prefab: propertyPath: m_SizeDelta.y value: -6.76 objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -6879,6 +6889,16 @@ Prefab: propertyPath: m_SizeDelta.y value: -5.31 objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -7026,6 +7046,16 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: StartDraggin objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -7245,6 +7275,16 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: StartDraggin objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -8407,6 +8447,16 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1724986183} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -8570,6 +8620,16 @@ Prefab: propertyPath: m_SizeDelta.y value: -2 objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -8772,6 +8832,16 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: StartDraggin objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -9047,15 +9117,59 @@ Prefab: propertyPath: m_Name value: Slot (01) objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114075990726184668, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Color.r + value: 0.33962262 + objectReference: {fileID: 0} + - target: {fileID: 114075990726184668, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Color.g + value: 0.15006909 + objectReference: {fileID: 0} + - target: {fileID: 114075990726184668, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Color.b + value: 0.10092559 + objectReference: {fileID: 0} + - target: {fileID: 114075990726184668, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Type + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114075990726184668, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 5014488f5c2b6164d8e76a2a4b68969f, - type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} - propertyPath: m_PreserveAspect + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] @@ -9210,6 +9324,16 @@ Prefab: propertyPath: m_AnchoredPosition.x value: 5.9 objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -9426,6 +9550,16 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: StartDraggin objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -9568,6 +9702,16 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1724986183} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -9953,6 +10097,16 @@ Prefab: propertyPath: m_AnchoredPosition.x value: 6.1 objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -13179,8 +13333,9 @@ MonoBehaviour: - {fileID: 798873072} items: - type: 1 - description: LE POKETEXTE OUIIIIIIIII + description: A regular and completly normal apple tree icon: {fileID: 21300000, guid: 5014488f5c2b6164d8e76a2a4b68969f, type: 3} + iconGris: {fileID: 21300000, guid: 8b8e327a290a7da4ebdeb014e2863c6e, type: 3} tiles: - {fileID: 0} - {fileID: 11400000, guid: 9d866a74ea944d14f81bb4133b55bdc9, type: 2} @@ -13204,6 +13359,7 @@ MonoBehaviour: - type: 2 description: icon: {fileID: 21300000, guid: 7467489d95ee4604690203dd25ef1061, type: 3} + iconGris: {fileID: 0} tiles: - {fileID: 0} - {fileID: 11400000, guid: 93eb7068b8cafe040820f9cdd3937728, type: 2} @@ -13227,6 +13383,7 @@ MonoBehaviour: - type: 3 description: icon: {fileID: 21300000, guid: aedcd7fa2034175429245107bd2c7ff2, type: 3} + iconGris: {fileID: 0} tiles: - {fileID: 11400000, guid: 1e14234e4e7eead4991788c699147ac6, type: 2} - {fileID: 11400000, guid: 0eabd7b48c7f1d74d8e2ebff00965d40, type: 2} @@ -13250,6 +13407,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 21300000, guid: bd94c803c8d0053459513209a51b6626, type: 3} + iconGris: {fileID: 0} tiles: - {fileID: 11400000, guid: 632d6b11a4126264fa5688ebdb0af498, type: 2} - {fileID: 11400000, guid: 6b47af5ac3648974295f87d18bf45d6e, type: 2} @@ -13273,6 +13431,7 @@ MonoBehaviour: - type: 5 description: icon: {fileID: 21300000, guid: 632fdd0b5928dfc40b00b5cb328dab12, type: 3} + iconGris: {fileID: 0} tiles: - {fileID: 0} - {fileID: 11400000, guid: 9005101fbf5ed184097fb3e6e4200c48, type: 2} @@ -13296,6 +13455,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 21300000, guid: c456bf1a77abe7f4a976c2730660784a, type: 3} + iconGris: {fileID: 0} tiles: - {fileID: 11400000, guid: 0525d036030679643b5129f345915bc3, type: 2} - {fileID: 11400000, guid: bbf8216bc55b6da4eb4e1394934bbb6f, type: 2} @@ -13319,6 +13479,7 @@ MonoBehaviour: - type: 7 description: icon: {fileID: 21300000, guid: 435e6a6ec8a286642b6e3d806a4df4a2, type: 3} + iconGris: {fileID: 0} tiles: - {fileID: 0} - {fileID: 11400000, guid: fee8f2d6f64b07d4e8bba1dae4604963, type: 2} @@ -13342,6 +13503,7 @@ MonoBehaviour: - type: 8 description: icon: {fileID: 21300000, guid: 3db57d319be56e549bcab5adcebba956, type: 3} + iconGris: {fileID: 0} tiles: - {fileID: 11400000, guid: 7c6fc02627747564a865518d3642cfe7, type: 2} - {fileID: 11400000, guid: 3a000016f5db7b8499420032df45c6eb, type: 2} @@ -13365,6 +13527,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 0} + iconGris: {fileID: 0} tiles: [] canOverrideTree: 0 canBePlacedOn: 0 @@ -13372,6 +13535,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 0} + iconGris: {fileID: 0} tiles: [] canOverrideTree: 0 canBePlacedOn: 0 @@ -13379,6 +13543,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 0} + iconGris: {fileID: 0} tiles: [] canOverrideTree: 0 canBePlacedOn: 0 @@ -13386,6 +13551,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 0} + iconGris: {fileID: 0} tiles: [] canOverrideTree: 0 canBePlacedOn: 0 @@ -13393,6 +13559,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 0} + iconGris: {fileID: 0} tiles: [] canOverrideTree: 0 canBePlacedOn: 0 @@ -13400,6 +13567,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 0} + iconGris: {fileID: 0} tiles: [] canOverrideTree: 0 canBePlacedOn: 0 @@ -13407,6 +13575,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 0} + iconGris: {fileID: 0} tiles: [] canOverrideTree: 0 canBePlacedOn: 0 @@ -13730,6 +13899,16 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: StartDraggin objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -13898,6 +14077,16 @@ Prefab: propertyPath: m_SizeDelta.y value: -8 objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -14056,6 +14245,16 @@ Prefab: propertyPath: m_AnchoredPosition.y value: -7.8 objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 diff --git a/Assets/Script/InventoryManager.cs b/Assets/Script/InventoryManager.cs index 34d3777..31ec472 100644 --- a/Assets/Script/InventoryManager.cs +++ b/Assets/Script/InventoryManager.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.Tilemaps; +using TMPro; public class InventoryManager : MonoBehaviour { @@ -38,10 +39,18 @@ public class InventoryManager : MonoBehaviour PlaceTree(items[draggedPosition], cam.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, treeMap.transform.parent.position.z))); items[draggedPosition].count -= 1; slots[draggedPosition].transform.GetChild(1).position = defaultPos; - - if(items[draggedPosition].count < 1) + TextMeshProUGUI CompteurItem = slots[draggedPosition].GetComponentInChildren(); + CompteurItem.text = items[draggedPosition].count.ToString(); + if (items[draggedPosition].count < 1) { - //Faut grisser + if (items[draggedPosition].iconGris != null) + { + GetComponent().sprite = items[draggedPosition].iconGris; + } + else + { + Debug.LogErrorFormat("L'image en noire et blanc du slot" + draggedPosition + 1 + "n'a pas été assigné"); + } } } else diff --git a/Assets/Script/TreeItem.cs b/Assets/Script/TreeItem.cs index d67db38..2bcd546 100644 --- a/Assets/Script/TreeItem.cs +++ b/Assets/Script/TreeItem.cs @@ -7,6 +7,7 @@ public class TreeItem public TreeType type; public string description; public Sprite icon; + public Sprite iconGris; public TileBase[] tiles = new TileBase[16]; [EnumFlags] public TreeType canOverrideTree; [EnumFlags] public PlotType canBePlacedOn; diff --git a/Assets/TreeIcons/Arbre Normal 1 ICO.png.meta b/Assets/TreeIcons/Arbre Normal 1 ICO.png.meta index e9e13de..da7d86f 100644 --- a/Assets/TreeIcons/Arbre Normal 1 ICO.png.meta +++ b/Assets/TreeIcons/Arbre Normal 1 ICO.png.meta @@ -86,7 +86,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: f87c32fc4e921b2408bb8a392ad526bd vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/Arbre Normal 1 gris.png b/Assets/TreeIcons/Arbre Normal 1 gris.png new file mode 100644 index 0000000..2e584aa Binary files /dev/null and b/Assets/TreeIcons/Arbre Normal 1 gris.png differ diff --git a/Assets/TreeIcons/Arbre Normal 1 gris.png.meta b/Assets/TreeIcons/Arbre Normal 1 gris.png.meta new file mode 100644 index 0000000..7b8b84e --- /dev/null +++ b/Assets/TreeIcons/Arbre Normal 1 gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 8b8e327a290a7da4ebdeb014e2863c6e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TreeIcons/CakpPus.png.meta b/Assets/TreeIcons/CakpPus.png.meta index 901d4a8..6742038 100644 --- a/Assets/TreeIcons/CakpPus.png.meta +++ b/Assets/TreeIcons/CakpPus.png.meta @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 7ca4c2a5ada5f6c4c8280514f7faeb9e vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/LEBOISDDESESMORT ico.png.meta b/Assets/TreeIcons/LEBOISDDESESMORT ico.png.meta index 048467e..4ecc6e6 100644 --- a/Assets/TreeIcons/LEBOISDDESESMORT ico.png.meta +++ b/Assets/TreeIcons/LEBOISDDESESMORT ico.png.meta @@ -86,7 +86,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 4b7fd1d4737a02c4488c89468613cd05 vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/LEBOISDDESESMORT.jpg gris.png b/Assets/TreeIcons/LEBOISDDESESMORT.jpg gris.png new file mode 100644 index 0000000..c5eadba Binary files /dev/null and b/Assets/TreeIcons/LEBOISDDESESMORT.jpg gris.png differ diff --git a/Assets/TreeIcons/LEBOISDDESESMORT.jpg gris.png.meta b/Assets/TreeIcons/LEBOISDDESESMORT.jpg gris.png.meta new file mode 100644 index 0000000..86d5232 --- /dev/null +++ b/Assets/TreeIcons/LEBOISDDESESMORT.jpg gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: ef29ac5abb1733d4c8a523736c325205 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TreeIcons/Laurier ICO.png.meta b/Assets/TreeIcons/Laurier ICO.png.meta index fec46cd..ddc3dcb 100644 --- a/Assets/TreeIcons/Laurier ICO.png.meta +++ b/Assets/TreeIcons/Laurier ICO.png.meta @@ -86,7 +86,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 4975265120178ec46a1bd616728d285f vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/Laurier gris.png b/Assets/TreeIcons/Laurier gris.png new file mode 100644 index 0000000..4435634 Binary files /dev/null and b/Assets/TreeIcons/Laurier gris.png differ diff --git a/Assets/TreeIcons/Laurier gris.png.meta b/Assets/TreeIcons/Laurier gris.png.meta new file mode 100644 index 0000000..3b29fee --- /dev/null +++ b/Assets/TreeIcons/Laurier gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 450c5f961034eb947be5cc6dff2c15fd +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TreeIcons/Sapin ICO.png.meta b/Assets/TreeIcons/Sapin ICO.png.meta index 2060fd7..99764b1 100644 --- a/Assets/TreeIcons/Sapin ICO.png.meta +++ b/Assets/TreeIcons/Sapin ICO.png.meta @@ -86,7 +86,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: a9933e688f9ec1845b24ebb7bc969a07 vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/Sapin gris.png b/Assets/TreeIcons/Sapin gris.png new file mode 100644 index 0000000..c11c8a8 Binary files /dev/null and b/Assets/TreeIcons/Sapin gris.png differ diff --git a/Assets/TreeIcons/Sapin gris.png.meta b/Assets/TreeIcons/Sapin gris.png.meta new file mode 100644 index 0000000..45142c5 --- /dev/null +++ b/Assets/TreeIcons/Sapin gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 1640efb3bcc88e14fafb6f62de15e1ac +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TreeIcons/Tree2 ICO.png.meta b/Assets/TreeIcons/Tree2 ICO.png.meta index aa12b23..09b5b01 100644 --- a/Assets/TreeIcons/Tree2 ICO.png.meta +++ b/Assets/TreeIcons/Tree2 ICO.png.meta @@ -86,7 +86,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 6d16399412f9ffa479bd677b05eb522c vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/Tree2 gris.png b/Assets/TreeIcons/Tree2 gris.png new file mode 100644 index 0000000..feed6f2 Binary files /dev/null and b/Assets/TreeIcons/Tree2 gris.png differ diff --git a/Assets/TreeIcons/Tree2 gris.png.meta b/Assets/TreeIcons/Tree2 gris.png.meta new file mode 100644 index 0000000..d5a2bff --- /dev/null +++ b/Assets/TreeIcons/Tree2 gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 024f54f424e5378489e582232317a8f1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TreeIcons/Tree3 ICO.png.meta b/Assets/TreeIcons/Tree3 ICO.png.meta index 960f849..0cc4fa8 100644 --- a/Assets/TreeIcons/Tree3 ICO.png.meta +++ b/Assets/TreeIcons/Tree3 ICO.png.meta @@ -86,7 +86,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: bfdba56694b0ed14c919f58fb77e46df vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/Tree3 gris.png b/Assets/TreeIcons/Tree3 gris.png new file mode 100644 index 0000000..f1e6f79 Binary files /dev/null and b/Assets/TreeIcons/Tree3 gris.png differ diff --git a/Assets/TreeIcons/Tree3 gris.png.meta b/Assets/TreeIcons/Tree3 gris.png.meta new file mode 100644 index 0000000..cc9fe66 --- /dev/null +++ b/Assets/TreeIcons/Tree3 gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 57371782065a2dc47937457212458fe9 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TreeIcons/Tree4 ICO.png.meta b/Assets/TreeIcons/Tree4 ICO.png.meta index a974a38..106978e 100644 --- a/Assets/TreeIcons/Tree4 ICO.png.meta +++ b/Assets/TreeIcons/Tree4 ICO.png.meta @@ -86,7 +86,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 3b74c1149880a304485d6187a4a5d93b vertices: [] indices: edges: [] diff --git a/Assets/TreeIcons/Tree4 gris.png b/Assets/TreeIcons/Tree4 gris.png new file mode 100644 index 0000000..ac34105 Binary files /dev/null and b/Assets/TreeIcons/Tree4 gris.png differ diff --git a/Assets/TreeIcons/Tree4 gris.png.meta b/Assets/TreeIcons/Tree4 gris.png.meta new file mode 100644 index 0000000..97dbafd --- /dev/null +++ b/Assets/TreeIcons/Tree4 gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: d994c9c58127290458278a8461e10c96 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: