diff --git a/Assets/Prefab/Slot.prefab b/Assets/Prefab/Slot.prefab index 0ba0f8a..59b57da 100644 --- a/Assets/Prefab/Slot.prefab +++ b/Assets/Prefab/Slot.prefab @@ -55,7 +55,6 @@ GameObject: m_Component: - component: {fileID: 224033869162317232} - component: {fileID: 222770785543349892} - - component: {fileID: 114075990726184668} - component: {fileID: 114388585109436590} m_Layer: 5 m_Name: Slot @@ -130,33 +129,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &114075990726184668 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1472403156812664} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.6886792, g: 0.37323403, b: 0.2891153, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114262927923472642 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index cb2511b..9d46024 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -9120,56 +9120,11 @@ Prefab: - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 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_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, - type: 2} - 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: [] @@ -13359,7 +13314,7 @@ MonoBehaviour: - type: 2 description: icon: {fileID: 21300000, guid: 7467489d95ee4604690203dd25ef1061, type: 3} - iconGris: {fileID: 0} + iconGris: {fileID: 21300000, guid: 57371782065a2dc47937457212458fe9, type: 3} tiles: - {fileID: 0} - {fileID: 11400000, guid: 93eb7068b8cafe040820f9cdd3937728, type: 2} @@ -13381,9 +13336,10 @@ MonoBehaviour: canBePlacedOn: 16 count: 0 - type: 3 - description: + description: This tree got super fast metabolism witch allow it to replicate himself + very quicly icon: {fileID: 21300000, guid: aedcd7fa2034175429245107bd2c7ff2, type: 3} - iconGris: {fileID: 0} + iconGris: {fileID: 21300000, guid: 450c5f961034eb947be5cc6dff2c15fd, type: 3} tiles: - {fileID: 11400000, guid: 1e14234e4e7eead4991788c699147ac6, type: 2} - {fileID: 11400000, guid: 0eabd7b48c7f1d74d8e2ebff00965d40, type: 2} @@ -13407,7 +13363,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 21300000, guid: bd94c803c8d0053459513209a51b6626, type: 3} - iconGris: {fileID: 0} + iconGris: {fileID: 21300000, guid: 024f54f424e5378489e582232317a8f1, type: 3} tiles: - {fileID: 11400000, guid: 632d6b11a4126264fa5688ebdb0af498, type: 2} - {fileID: 11400000, guid: 6b47af5ac3648974295f87d18bf45d6e, type: 2} @@ -13431,7 +13387,7 @@ MonoBehaviour: - type: 5 description: icon: {fileID: 21300000, guid: 632fdd0b5928dfc40b00b5cb328dab12, type: 3} - iconGris: {fileID: 0} + iconGris: {fileID: 21300000, guid: 1640efb3bcc88e14fafb6f62de15e1ac, type: 3} tiles: - {fileID: 0} - {fileID: 11400000, guid: 9005101fbf5ed184097fb3e6e4200c48, type: 2} @@ -13455,7 +13411,7 @@ MonoBehaviour: - type: 0 description: icon: {fileID: 21300000, guid: c456bf1a77abe7f4a976c2730660784a, type: 3} - iconGris: {fileID: 0} + iconGris: {fileID: 21300000, guid: d994c9c58127290458278a8461e10c96, type: 3} tiles: - {fileID: 11400000, guid: 0525d036030679643b5129f345915bc3, type: 2} - {fileID: 11400000, guid: bbf8216bc55b6da4eb4e1394934bbb6f, type: 2} @@ -13479,7 +13435,7 @@ MonoBehaviour: - type: 7 description: icon: {fileID: 21300000, guid: 435e6a6ec8a286642b6e3d806a4df4a2, type: 3} - iconGris: {fileID: 0} + iconGris: {fileID: 21300000, guid: ef29ac5abb1733d4c8a523736c325205, type: 3} tiles: - {fileID: 0} - {fileID: 11400000, guid: fee8f2d6f64b07d4e8bba1dae4604963, type: 2} @@ -13503,7 +13459,7 @@ MonoBehaviour: - type: 8 description: icon: {fileID: 21300000, guid: 3db57d319be56e549bcab5adcebba956, type: 3} - iconGris: {fileID: 0} + iconGris: {fileID: 21300000, guid: fce0d70ab60dddb4bba88e2e7854936e, type: 3} tiles: - {fileID: 11400000, guid: 7c6fc02627747564a865518d3642cfe7, type: 2} - {fileID: 11400000, guid: 3a000016f5db7b8499420032df45c6eb, type: 2} diff --git a/Assets/Script/InventoryManager.cs b/Assets/Script/InventoryManager.cs index eb75961..cf00156 100644 --- a/Assets/Script/InventoryManager.cs +++ b/Assets/Script/InventoryManager.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.Tilemaps; using TMPro; +using UnityEngine.UI; public class InventoryManager : MonoBehaviour { @@ -43,14 +44,7 @@ public class InventoryManager : MonoBehaviour CompteurItem.text = items[draggedPosition].count.ToString(); if (items[draggedPosition].count < 1) { - 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é"); - } + slots[draggedPosition].transform.GetChild(1).GetComponent().sprite = items[draggedPosition].iconGris; } } else diff --git a/Assets/Script/Mission.cs b/Assets/Script/Mission.cs new file mode 100644 index 0000000..53d8c4a --- /dev/null +++ b/Assets/Script/Mission.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Mission : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/Script/Mission.cs.meta b/Assets/Script/Mission.cs.meta new file mode 100644 index 0000000..49acc79 --- /dev/null +++ b/Assets/Script/Mission.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b4b4a071451fb1c47af7fedbbf6a4179 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TreeIcons/CakpPut gris.png b/Assets/TreeIcons/CakpPut gris.png new file mode 100644 index 0000000..9d5886d Binary files /dev/null and b/Assets/TreeIcons/CakpPut gris.png differ diff --git a/Assets/TreeIcons/CakpPut gris.png.meta b/Assets/TreeIcons/CakpPut gris.png.meta new file mode 100644 index 0000000..97689c9 --- /dev/null +++ b/Assets/TreeIcons/CakpPut gris.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: fce0d70ab60dddb4bba88e2e7854936e +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: