diff --git a/Assets/GAME/Images/Item/Axe_Stone.png b/Assets/GAME/Images/Item/Axe_Stone.png deleted file mode 100644 index 57f2f492..00000000 Binary files a/Assets/GAME/Images/Item/Axe_Stone.png and /dev/null differ diff --git a/Assets/GAME/Images/Item/Axe_Wood.png b/Assets/GAME/Images/Item/Axe_Wood.png deleted file mode 100644 index 7c58f1df..00000000 Binary files a/Assets/GAME/Images/Item/Axe_Wood.png and /dev/null differ diff --git a/Assets/GAME/Images/Item/Axe_Wood.png.meta b/Assets/GAME/Images/Item/Axe_Wood.png.meta deleted file mode 100644 index d6772595..00000000 --- a/Assets/GAME/Images/Item/Axe_Wood.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 573d176f3cdfdbb498814a58d66f6e49 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_36_08.png b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_36_08.png new file mode 100644 index 00000000..6cdc152b Binary files /dev/null and b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_36_08.png differ diff --git a/Assets/GAME/Images/Item/Pixaxe_Stone.png.meta b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_36_08.png.meta similarity index 98% rename from Assets/GAME/Images/Item/Pixaxe_Stone.png.meta rename to Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_36_08.png.meta index d36745a6..00414e7b 100644 --- a/Assets/GAME/Images/Item/Pixaxe_Stone.png.meta +++ b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_36_08.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 43f5a0760e550c148ba53b7db9a7c24e +guid: 2237e4ae38354ff459a9b61781694de6 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_39_23.png b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_39_23.png new file mode 100644 index 00000000..8090fc81 Binary files /dev/null and b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_39_23.png differ diff --git a/Assets/GAME/Images/Item/Axe_Stone.png.meta b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_39_23.png.meta similarity index 98% rename from Assets/GAME/Images/Item/Axe_Stone.png.meta rename to Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_39_23.png.meta index b2aef959..eb40fbac 100644 --- a/Assets/GAME/Images/Item/Axe_Stone.png.meta +++ b/Assets/GAME/Images/Item/ChatGPT Image 25 juin 2026, 09_39_23.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ea8988d57601254ca812967bcaf937f +guid: 54487ce577c03b647989cae7eef4e1e4 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/GAME/Images/Item/Pixaxe_Stone.png b/Assets/GAME/Images/Item/Pixaxe_Stone.png deleted file mode 100644 index 0d4be85a..00000000 Binary files a/Assets/GAME/Images/Item/Pixaxe_Stone.png and /dev/null differ diff --git a/Assets/GAME/Images/Item/Pixaxe_Wood.png b/Assets/GAME/Images/Item/Pixaxe_Wood.png deleted file mode 100644 index 25663fe4..00000000 Binary files a/Assets/GAME/Images/Item/Pixaxe_Wood.png and /dev/null differ diff --git a/Assets/GAME/Images/Item/Pixaxe_Wood.png.meta b/Assets/GAME/Images/Item/Pixaxe_Wood.png.meta deleted file mode 100644 index d11dade6..00000000 --- a/Assets/GAME/Images/Item/Pixaxe_Wood.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 8a4bc5d9209e3344fbd9505fee280256 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GAME/Resources/ItemDatabase.asset b/Assets/GAME/Resources/ItemDatabase.asset index cfba05ad..19103577 100644 --- a/Assets/GAME/Resources/ItemDatabase.asset +++ b/Assets/GAME/Resources/ItemDatabase.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: ItemDatabase m_EditorClassIdentifier: Assembly-CSharp::ItemDatabase items: - - {fileID: 11400000, guid: 66c8ce9f2516f22488502db44d9d49af, type: 2} - {fileID: 11400000, guid: ec7da2efc3ec41e19256b7a17fb4a0e2, type: 2} - {fileID: 11400000, guid: 9340c6bceb10c9b47bdaf993427004e3, type: 2} - {fileID: 11400000, guid: d7dc41946d5f4ccdbd12b1c958586a6b, type: 2} @@ -29,5 +28,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 6b543ed8734f4dcf984c1c43d63a9207, type: 2} - {fileID: 11400000, guid: 51e850551f3764447b2e8b6168f82e3b, type: 2} - {fileID: 11400000, guid: 97ba39137a324f19ac1a910464492297, type: 2} - - {fileID: 11400000, guid: bfc0597ed0ad41cc86e48f34052ec45f, type: 2} - {fileID: 11400000, guid: 0cadc69b42f24da49ca5ef62adfbddf8, type: 2} + - {fileID: 11400000, guid: 66c8ce9f2516f22488502db44d9d49af, type: 2} diff --git a/Assets/GAME/Scenes/0_Init.unity b/Assets/GAME/Scenes/0_Init.unity index 73d1d603..a65f6515 100644 --- a/Assets/GAME/Scenes/0_Init.unity +++ b/Assets/GAME/Scenes/0_Init.unity @@ -339,6 +339,14 @@ PrefabInstance: propertyPath: m_Name value: IngameDebugConsole objectReference: {fileID: 0} + - target: {fileID: 11440770, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_ReferenceResolution.x + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 11440770, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_ReferenceResolution.y + value: 1080 + objectReference: {fileID: 0} - target: {fileID: 11452418, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: startMinimized value: 0 @@ -365,7 +373,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000015258789 + value: -0.000022888184 objectReference: {fileID: 0} - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.x @@ -375,6 +383,14 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: NaN + objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -527,6 +543,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -623,10 +651,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 958269219681220773, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} - target: {fileID: 958269219681220773, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 objectReference: {fileID: 0} + - target: {fileID: 2369662702609791303, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} - target: {fileID: 2369662702609791303, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 @@ -651,14 +687,26 @@ PrefabInstance: propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 objectReference: {fileID: 0} + - target: {fileID: 8026934286120355878, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8026934286120355878, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 objectReference: {fileID: 0} + - target: {fileID: 8276117061088563291, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8276117061088563291, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 objectReference: {fileID: 0} + - target: {fileID: 8949468901311314302, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8949468901311314302, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 diff --git a/Assets/GAME/ScriptableObjects/Items/Hammer.asset b/Assets/GAME/ScriptableObjects/Items/Hammer.asset index 2da779dc..093dd2db 100644 --- a/Assets/GAME/ScriptableObjects/Items/Hammer.asset +++ b/Assets/GAME/ScriptableObjects/Items/Hammer.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Hammer m_EditorClassIdentifier: Assembly-CSharp::ItemData itemName: Marteau - icon: {fileID: 0} + icon: {fileID: 21300000, guid: 54487ce577c03b647989cae7eef4e1e4, type: 3} description: Marteau pour construire et reparer les structures. isStackable: 0 maxStackSize: 64 @@ -23,5 +23,9 @@ MonoBehaviour: healthRestore: 0 hungerRestore: 0 thirstRestore: 0 + cookedResult: {fileID: 0} + cookTime: 10 + isFuel: 0 + fuelSeconds: 30 worldPrefab: {fileID: 1085285520790580, guid: 1e19fae830ce27a44b2068b7e4550efc, type: 3} handPrefab: {fileID: 1085285520790580, guid: 9f64ed5ce0216394d91f836dbefecf5d, type: 3} diff --git a/Assets/GAME/ScriptableObjects/Items/Pickaxe.asset b/Assets/GAME/ScriptableObjects/Items/Pickaxe.asset index 54da4b68..540cfd0c 100644 --- a/Assets/GAME/ScriptableObjects/Items/Pickaxe.asset +++ b/Assets/GAME/ScriptableObjects/Items/Pickaxe.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f53cff53f28e82d42a1a8d25c52d87f4, type: 3} m_Name: Pickaxe m_EditorClassIdentifier: Assembly-CSharp::ItemData - itemName: Pioche - icon: {fileID: 0} + itemName: Pioche en pirre + icon: {fileID: 21300000, guid: 2237e4ae38354ff459a9b61781694de6, type: 3} description: Pioche pour extraire la pierre et le minerai. isStackable: 0 maxStackSize: 64 @@ -23,5 +23,9 @@ MonoBehaviour: healthRestore: 0 hungerRestore: 0 thirstRestore: 0 + cookedResult: {fileID: 0} + cookTime: 10 + isFuel: 0 + fuelSeconds: 30 worldPrefab: {fileID: 1392316285209212, guid: 292fc529ad2a9a54ea83dfc1beb0b683, type: 3} handPrefab: {fileID: 1392316285209212, guid: 869385138ceeb3c4e9ed5f72da8d50d7, type: 3} diff --git a/Assets/GAME/ScriptableObjects/Items/Water.asset b/Assets/GAME/ScriptableObjects/Items/Water.asset deleted file mode 100644 index a234fa7d..00000000 --- a/Assets/GAME/ScriptableObjects/Items/Water.asset +++ /dev/null @@ -1,27 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f53cff53f28e82d42a1a8d25c52d87f4, type: 3} - m_Name: Water - m_EditorClassIdentifier: Assembly-CSharp::ItemData - itemName: Eau - icon: {fileID: 0} - description: Eau potable, etanche la soif. - isStackable: 1 - maxStackSize: 10 - itemType: 3 - harvestType: 0 - toolPower: 1 - healthRestore: 0 - hungerRestore: 0 - thirstRestore: 25 - worldPrefab: {fileID: 2848928878313733705, guid: aee821ce97ce54a409d60916304c8311, type: 3} - handPrefab: {fileID: 0} diff --git a/Assets/GAME/ScriptableObjects/Items/Water.asset.meta b/Assets/GAME/ScriptableObjects/Items/Water.asset.meta deleted file mode 100644 index 03bbc0c8..00000000 --- a/Assets/GAME/ScriptableObjects/Items/Water.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bfc0597ed0ad41cc86e48f34052ec45f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: