Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

# Conflicts: # Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat # Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
@@ -0,0 +1,111 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &1101463419124301057
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 8219425546800018065, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_Name
+      value: Pioche_en_Bois
+      objectReference: {fileID: 0}
+    - target: {fileID: 8219425546800018065, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 8219425546800018065, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4534358425995801905}
+    - targetCorrespondingSourceObject: {fileID: 8219425546800018065, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4200035120000206940}
+  m_SourcePrefab: {fileID: 100100000, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+--- !u!1 &9032088729056219024 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8219425546800018065, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
+  m_PrefabInstance: {fileID: 1101463419124301057}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &4534358425995801905
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9032088729056219024}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.60922796, y: 0.65663785, z: 0.10033387}
+  m_Center: {x: -0.055951215, y: 0.329326, z: 0}
+--- !u!114 &4200035120000206940
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9032088729056219024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eed740dea8aa59b4cb516f25ce139314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Network.Pickable
+  id: -1
+  itemData: {fileID: 11400000, guid: 87cbf77d115c72d4e9cbcc71feceab59, type: 2}
+  quantity: 1
+  interactionVerb: Pick up
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cdeb9c121d922ed459bb03f302f541cf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: