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/External/Raygeas/Grasslands - Stylized Nature/Assets/Prefabs/Vegetation/Bush_Large.prefab
Vendored
+72 -2
View File
@@ -12,7 +12,9 @@ GameObject:
- component: {fileID: 3534942674725830016}
- component: {fileID: 1651225585276815690}
- component: {fileID: 2346740313283600116}
m_Layer: 0
- component: {fileID: 1783695746313819419}
- component: {fileID: 2915264366376043546}
m_Layer: 15
m_Name: Bush_Large
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -115,6 +117,74 @@ LODGroup:
renderers:
- renderer: {fileID: 1379619094456448164}
m_Enabled: 1
--- !u!114 &1783695746313819419
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1002799254489114783}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7fda9de5aca90194dbd292acb461b816, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Harvesting.Harvestable
id: 5
harvestType: 1
maxHealth: 100
allowBareHandHarvest: 1
bareHandDamage: 25
interactionVerb: Gather
bareHandDrops:
- item: {fileID: 11400000, guid: 98db74b3742a44ca8a087fb291f04a4a, type: 2}
minQuantity: 1
maxQuantity: 5
dropChance: 0.75
- item: {fileID: 11400000, guid: ec7da2efc3ec41e19256b7a17fb4a0e2, type: 2}
minQuantity: 2
maxQuantity: 5
dropChance: 0.25
toolDrops:
- tool: {fileID: 0}
drops:
- item: {fileID: 0}
minQuantity: 0
maxQuantity: 0
dropChance: 0
hitStartScaleFactor: 0.85
hitBumpDuration: 0.18
hitBumpEase: 27
blockedStartScaleFactor: 0.95
blockedBumpDuration: 0.1
canRespawn: 1
respawnDelay: 60
onHit:
m_PersistentCalls:
m_Calls: []
onDepleted:
m_PersistentCalls:
m_Calls: []
--- !u!135 &2915264366376043546
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1002799254489114783}
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_Radius: 1.19
m_Center: {x: -0.050050378, y: 0.38, z: -0.05}
--- !u!1 &1686367592137691871
GameObject:
m_ObjectHideFlags: 0
@@ -126,7 +196,7 @@ GameObject:
- component: {fileID: 3163358872893149024}
- component: {fileID: 6073671870951601919}
- component: {fileID: 1379619094456448164}
m_Layer: 0
m_Layer: 15
m_Name: Bush_Large_LOD0
m_TagString: Untagged
m_Icon: {fileID: 0}
Assets/External/Raygeas/Grasslands - Stylized Nature/Assets/Prefabs/Vegetation/Bush_Medium.prefab
Vendored
+66 -2
View File
@@ -12,7 +12,9 @@ GameObject:
- component: {fileID: 6693185778260067529}
- component: {fileID: 8864788624075632643}
- component: {fileID: 7838405100959771779}
m_Layer: 0
- component: {fileID: 6589136965119880157}
- component: {fileID: 1079506428694670211}
m_Layer: 15
m_Name: Bush_Medium
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -115,6 +117,68 @@ LODGroup:
renderers:
- renderer: {fileID: 7150758256023181130}
m_Enabled: 1
--- !u!114 &6589136965119880157
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6919484204201546198}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7fda9de5aca90194dbd292acb461b816, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Harvesting.Harvestable
id: 3
harvestType: 1
maxHealth: 100
allowBareHandHarvest: 1
bareHandDamage: 25
interactionVerb: Gather
bareHandDrops:
- item: {fileID: 11400000, guid: 98db74b3742a44ca8a087fb291f04a4a, type: 2}
minQuantity: 1
maxQuantity: 5
dropChance: 0.75
- item: {fileID: 11400000, guid: ec7da2efc3ec41e19256b7a17fb4a0e2, type: 2}
minQuantity: 2
maxQuantity: 5
dropChance: 0.25
toolDrops: []
hitStartScaleFactor: 0.85
hitBumpDuration: 0.18
hitBumpEase: 27
blockedStartScaleFactor: 0.95
blockedBumpDuration: 0.1
canRespawn: 1
respawnDelay: 60
onHit:
m_PersistentCalls:
m_Calls: []
onDepleted:
m_PersistentCalls:
m_Calls: []
--- !u!135 &1079506428694670211
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6919484204201546198}
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_Radius: 1.0820132
m_Center: {x: -0.028544962, y: 0.32, z: 0.011201382}
--- !u!1 &8750660172115151253
GameObject:
m_ObjectHideFlags: 0
@@ -126,7 +190,7 @@ GameObject:
- component: {fileID: 1623951661181867152}
- component: {fileID: 5967887190926513747}
- component: {fileID: 7150758256023181130}
m_Layer: 0
m_Layer: 15
m_Name: Bush_Medium_LOD0
m_TagString: Untagged
m_Icon: {fileID: 0}
Assets/External/Raygeas/Grasslands - Stylized Nature/Assets/Prefabs/Vegetation/Bush_Small.prefab
Vendored
+66 -2
View File
@@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2689938407141669648}
- component: {fileID: 4557024246721085693}
- component: {fileID: 4730743062144649285}
m_Layer: 0
m_Layer: 15
m_Name: Bush_Small_LOD0
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -102,7 +102,9 @@ GameObject:
- component: {fileID: 8580772507500892391}
- component: {fileID: 5832707322192307245}
- component: {fileID: 1875154109063793377}
m_Layer: 0
- component: {fileID: 2016789038741751238}
- component: {fileID: 7701022266949529587}
m_Layer: 15
m_Name: Bush_Small
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -205,3 +207,65 @@ LODGroup:
renderers:
- renderer: {fileID: 4730743062144649285}
m_Enabled: 1
--- !u!114 &2016789038741751238
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5472168320066651640}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7fda9de5aca90194dbd292acb461b816, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Harvesting.Harvestable
id: 2
harvestType: 1
maxHealth: 100
allowBareHandHarvest: 1
bareHandDamage: 25
interactionVerb: Gather
bareHandDrops:
- item: {fileID: 11400000, guid: 98db74b3742a44ca8a087fb291f04a4a, type: 2}
minQuantity: 1
maxQuantity: 5
dropChance: 0.75
- item: {fileID: 11400000, guid: ec7da2efc3ec41e19256b7a17fb4a0e2, type: 2}
minQuantity: 2
maxQuantity: 5
dropChance: 0.25
toolDrops: []
hitStartScaleFactor: 0.85
hitBumpDuration: 0.18
hitBumpEase: 27
blockedStartScaleFactor: 0.95
blockedBumpDuration: 0.1
canRespawn: 1
respawnDelay: 60
onHit:
m_PersistentCalls:
m_Calls: []
onDepleted:
m_PersistentCalls:
m_Calls: []
--- !u!135 &7701022266949529587
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5472168320066651640}
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_Radius: 0.58355224
m_Center: {x: -0.013474971, y: 0.32, z: -0.008137822}