Merge branch 'master' of git.unistra.fr:chirz/cityescape

5bbd5968 · v.bloch · f0344eb8 · 29a16219 · 5bbd5968 · 5bbd5968
Commit 5bbd5968 authored 3 years ago by v.bloch
--- a/Assets/Prefabs/Parcelles/Raffael_boutique.prefab
+++ b/Assets/Prefabs/Parcelles/Raffael_boutique.prefab
--- a/Assets/Prefabs/Parcelles/Raffael_boutique.prefab.meta
+++ b/Assets/Prefabs/Parcelles/Raffael_boutique.prefab.meta
+fileFormatVersion: 2
+guid: 450489dc9e7ad5b4884985008d8db9ea
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Parcelles/Raffael_village.prefab
+++ b/Assets/Prefabs/Parcelles/Raffael_village.prefab
--- a/Assets/Prefabs/Parcelles/Raffael_village.prefab.meta
+++ b/Assets/Prefabs/Parcelles/Raffael_village.prefab.meta
+fileFormatVersion: 2
+guid: e82f5ab2534cac640bfc13b37da27b4b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/NiveauParcelle.unity
+++ b/Assets/Scenes/NiveauParcelle.unity