From e7daa153b625aa4a358b15e19b3fbcb586e06852 Mon Sep 17 00:00:00 2001
From: "v.bloch" <v.bloch@etu.unistra.fr>
Date: Mon, 29 Mar 2021 16:49:16 +0200
Subject: [PATCH] modification du prefabs du shop
---
Assets/Prefabs/Shop.prefab | 15 +++++++++++++++
Assets/Scenes/Valentin.unity | 27 ++++++++-------------------
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/Assets/Prefabs/Shop.prefab b/Assets/Prefabs/Shop.prefab
index 6829516..6446a75 100644
--- a/Assets/Prefabs/Shop.prefab
+++ b/Assets/Prefabs/Shop.prefab
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: -421924145509232575}
- component: {fileID: 6595684778732623722}
- component: {fileID: 968398465587571092}
+ - component: {fileID: 7898263680220245293}
m_Layer: 0
m_Name: Shop
m_TagString: Untagged
@@ -147,3 +148,17 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 5, y: 1.9857826}
m_EdgeRadius: 0
+--- !u!114 &7898263680220245293
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 830773922753710147}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b0d67e78638d146bd8a6878c5027f9c5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ inventory: {fileID: 0}
+ sellItem: {fileID: 0}
diff --git a/Assets/Scenes/Valentin.unity b/Assets/Scenes/Valentin.unity
index 6f54548..0cc8185 100644
--- a/Assets/Scenes/Valentin.unity
+++ b/Assets/Scenes/Valentin.unity
@@ -123,25 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &56556506 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
- m_PrefabInstance: {fileID: 8964184068704032841}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &56556509
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 56556506}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b0d67e78638d146bd8a6878c5027f9c5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- inventory: {fileID: 145845055}
- sellItem: {fileID: 11400000, guid: 951b6ca289a8358458e441a19c5cc460, type: 2}
--- !u!1 &145845054
GameObject:
m_ObjectHideFlags: 0
@@ -17492,5 +17473,13 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: sellItem
+ value:
+ objectReference: {fileID: 11400000, guid: 951b6ca289a8358458e441a19c5cc460, type: 2}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: inventory
+ value:
+ objectReference: {fileID: 145845055}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
--
GitLab