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/Manager/BuildRegistry.prefab
+2 -2
View File
@@ -63,7 +63,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 10
<PrefabId>k__BackingField: 11
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 9975403408747794214
SceneId: 0
@@ -90,7 +90,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &289947267238384498
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/GAME/Prefabs/Manager/HarvestableRegistry.prefab
+1 -1
View File
@@ -90,7 +90,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &3185372856389979425
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/GAME/Prefabs/Manager/WorldPickupRegistry.prefab
+2 -2
View File
@@ -63,7 +63,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 17
<PrefabId>k__BackingField: 20
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 16949488085050316302
SceneId: 0
@@ -90,7 +90,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &3704013715362460501
MonoBehaviour:
m_ObjectHideFlags: 0