diff --git a/Assets/Items/1.Chaussures.asset b/Assets/Items/1.Chaussures.asset index 115f9c0572a31300846b9f831111dfe715d8b862..a6e925968149e67daf6f186a6cd66f4329dd0cd8 100644 --- a/Assets/Items/1.Chaussures.asset +++ b/Assets/Items/1.Chaussures.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: 1.Chaussures m_EditorClassIdentifier: id: 1 - name: Chaussures de marche + nom: Chaussure de marche description: Ces chaussures permettent de ne pas avoir mal aux pieds image: {fileID: 0} diff --git a/Assets/Items/2.Baton.asset b/Assets/Items/2.Baton.asset index 7ab27bb70ddc31307efb18a85c6e1a76e2572a12..53bfc67728708fe0d967e99c91ee195a637a77fa 100644 --- a/Assets/Items/2.Baton.asset +++ b/Assets/Items/2.Baton.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: 2.Baton m_EditorClassIdentifier: id: 2 - name: Baton de marche + nom: "B\xE2ton de marche" description: Permet de moin ce fatiguer image: {fileID: 0} diff --git "a/Assets/Items/3.R\303\251chaud.asset" "b/Assets/Items/3.R\303\251chaud.asset" index 095302c481355a42b86c5d5cfa4c4a3760e2a92e..4881a7b73f0e7f132f481ce4331331f1b61ffe62 100644 --- "a/Assets/Items/3.R\303\251chaud.asset" +++ "b/Assets/Items/3.R\303\251chaud.asset" @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: "3.R\xE9chaud" m_EditorClassIdentifier: id: 3 - name: "R\xE9chaud" + nom: "R\xE9chaud" description: Permet de faire des sorties plus longues en mangeant de super repas chaud. image: {fileID: 0} diff --git a/Assets/Items/4.Tente.asset b/Assets/Items/4.Tente.asset index c955b5c8b4732e03895f4f80013d646bffe40bc4..9cef59591e9d744ded509f2e3eda727dfcc52162 100644 --- a/Assets/Items/4.Tente.asset +++ b/Assets/Items/4.Tente.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: 4.Tente m_EditorClassIdentifier: id: 4 - name: Tente + nom: Tente description: "Permet de randonner tr\xE8s longtemps en dormant dans la for\xEAt." image: {fileID: 0} diff --git a/Assets/Prefabs/GUI/BarreDenature.prefab b/Assets/Prefabs/GUI/BarreDenature.prefab index 1b2c07700119ec3c12cfacbf3222cdbdf023a03d..8eb563478084a0e3e105e8229807c1af376d3ef5 100644 --- a/Assets/Prefabs/GUI/BarreDenature.prefab +++ b/Assets/Prefabs/GUI/BarreDenature.prefab @@ -384,7 +384,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -7.0000153} + m_AnchoredPosition: {x: 0, y: -7} m_SizeDelta: {x: 202.00002, y: 26.4841} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4436172266210469448 @@ -465,10 +465,10 @@ RectTransform: m_Father: {fileID: 9185901235847042339} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -471, y: 157} - m_SizeDelta: {x: -983.513, y: -467.4204} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 124.640625, y: -134.83777} + m_SizeDelta: {x: 207.7682, y: 118.2551} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4540222094778479021 CanvasRenderer: @@ -491,7 +491,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.70980394} + m_Color: {r: 1, g: 1, b: 1, a: 0.44705883} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity index 6352a4562fc127648bca82da8c04bf0af971ffd8..0261c0fb337313b2286d7038821867b7889aea66 100644 --- a/Assets/Scenes/sceneRaffael.unity +++ b/Assets/Scenes/sceneRaffael.unity @@ -968,7 +968,7 @@ MonoBehaviour: rechaud: {fileID: 11400000, guid: e217cd1973709d844bb97beb373c5447, type: 2} tente: {fileID: 11400000, guid: d72fe29080571f44ca0c6bd0d22ece7b, type: 2} GO_chaussures: {fileID: 2774278137072603174, guid: cf11893c496404d8292ea5623a2a0f32, type: 3} - GO_baton: {fileID: 0} + GO_baton: {fileID: 2815113491261155828, guid: 075eeb49ca9e1064ea07781a2deba9ae, type: 3} GO_rechaud: {fileID: 6742524767965565839, guid: a4179d20809394cfda68d226fc249d0b, type: 3} GO_tente: {fileID: 5026905876964516861, guid: 7bc98558919f34933bf9602e33e1bead, type: 3} pVillage: @@ -5306,6 +5306,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2695144739806175214, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 9185901235225783795, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3} propertyPath: m_AnchorMax.x value: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index daa2006940f365b744a480bc1c7645298b5de275..88a6c010ff7fbd6609cc4cc0a5c0d99ca6c90b1d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - Shop + - factory layers: - Default - TransparentFX