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

Merge branch 'feat/building' into feat/craft-discovery

Browse Source
This commit is contained in:
Mathew
2026-07-09 21:38:31 +02:00
parent faa061cced f5de33eac2
commit c9e923975d
12 changed files with 519 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/GAME/Scenes/Dev Scene/Dev Scene.unity
+101
View File
@@ -2517,6 +2517,10 @@ MonoBehaviour:
obstructionMask:
serializedVersion: 2
m_Bits: 512
buildMask:
serializedVersion: 2
m_Bits: 512
demolitionMaterial: {fileID: 2100000, guid: 0a594aa41ef0d7e428398c2c32772c64, type: 2}
--- !u!1001 &298545449
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5414,6 +5418,100 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8499178216258465, guid: e9894ffe485f7d5448260fd9338ebd0e, type: 3}
m_PrefabInstance: {fileID: 663482573}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &668733573
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 781270504346949712, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_Name
value: Stations_5
objectReference: {fileID: 0}
- target: {fileID: 781270504346949712, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 985001107293900664, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 1537286330038668216, guid: 73f5d288fb608fb4e9959cf5e9655783, type: 3}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalPosition.x
value: 49.20204
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalPosition.y
value: -0.005176544
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalPosition.z
value: 55.359283
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalRotation.w
value: 0.70710784
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalRotation.y
value: -0.70710576
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: 8601272150287418368, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 781270504346949712, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
insertIndex: -1
addedObject: {fileID: 668733575}
m_SourcePrefab: {fileID: 100100000, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
--- !u!1 &668733574 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 781270504346949712, guid: 8b0c536290aeb0b4caafd67bc736e9d2, type: 3}
m_PrefabInstance: {fileID: 668733573}
m_PrefabAsset: {fileID: 0}
--- !u!65 &668733575
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 668733574}
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: 2.7156103, y: 1.8032616, z: 1.15291}
m_Center: {x: 0.3753096, y: 0.90680677, z: 0.050604135}
--- !u!1 &713085368
GameObject:
m_ObjectHideFlags: 0
@@ -6209,6 +6307,8 @@ MonoBehaviour:
_prefab: Assets/GAME/Prefabs/Structure/Cookingpot_Campfire.prefab
- _gameObject: {fileID: 245990655}
_prefab: Assets/External/VFXPACK_FIRE_WALLCOEUR/Prefab/VFX_Fire.prefab
- _gameObject: {fileID: 668733574}
_prefab: Assets/External/Static Soul Studio/Crafting Statinos/Built-in/Prefabs/Stations_5.prefab
--- !u!4 &740572252
Transform:
m_ObjectHideFlags: 11
@@ -29516,3 +29616,4 @@ SceneRoots:
- {fileID: 1836939580}
- {fileID: 1902801754}
- {fileID: 1957565059}
- {fileID: 668733573}