Mathew/Emberwild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
Mathew
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/GAME/Prefabs/Tools/Pioche_en_Bois.prefab
+120
View File
@@ -0,0 +1,120 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4835160831230511101
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: 8
objectReference: {fileID: 0}
- target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
propertyPath: m_LocalScale.x
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
propertyPath: m_LocalScale.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
propertyPath: m_LocalScale.z
value: 1.5
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.29
objectReference: {fileID: 0}
- target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
propertyPath: m_LocalPosition.z
value: 0.15
objectReference: {fileID: 0}
- target: {fileID: 8744463598777624619, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
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.7071068
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: 6886932543381458403}
- targetCorrespondingSourceObject: {fileID: 8219425546800018065, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
insertIndex: -1
addedObject: {fileID: 3662451106709642073}
m_SourcePrefab: {fileID: 100100000, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
--- !u!1 &3533270531403527532 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8219425546800018065, guid: c00bd91003bf1774f8fedd4f0d12e8c9, type: 3}
m_PrefabInstance: {fileID: 4835160831230511101}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6886932543381458403
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3533270531403527532}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ccc8774893954fc40a153ddb5fdb1ffb, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Player.ToolBehaviour
harvestRange: 3
harvestMask:
serializedVersion: 2
m_Bits: 128
baseDamage: 10
wrongToolMultiplier: 0.25
swingCooldown: 0.5
--- !u!114 &3662451106709642073
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3533270531403527532}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7940b6e982f984f49856a6ea916a1918, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Player.HeldItemOffset
positionOffset: {x: 0, y: -0.29, z: 0.15}
rotationOffset: {x: 0, y: 90, z: 0}
scale: {x: 1.5, y: 1.5, z: 1.5}
Assets/GAME/Prefabs/Tools/Pioche_en_Bois.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cf74ac15809b5e74787b243d40877ba0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/GAME/Prefabs/Tools/Wood_Pickaxe.prefab
+63
View File
@@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &9137850018353647552
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: f066455c9b1b5644d9684ada3f210715, type: 2}
- target: {fileID: 919132149155446097, guid: 9bf264414994db540866bf91890392c5, type: 3}
propertyPath: m_Name
value: Wood_Pickaxe
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9bf264414994db540866bf91890392c5, type: 3}
Assets/GAME/Prefabs/Tools/Wood_Pickaxe.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c00bd91003bf1774f8fedd4f0d12e8c9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: