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
This commit is contained in:
@@ -70,6 +70,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fe38331f524a7db4cb3d53381b9ea244, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Building.BuiltStructure
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 8751794752429108}
|
||||
_networkObjectCache: {fileID: 8751794752429108}
|
||||
bumpDuration: 0.22
|
||||
startScaleFactor: 0.7
|
||||
bumpEase: 27
|
||||
@@ -131,6 +134,7 @@ MonoBehaviour:
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
<PredictedOwner>k__BackingField: {fileID: 0}
|
||||
NetworkBehaviours:
|
||||
- {fileID: 7507030739449404127}
|
||||
- {fileID: 675340278771037740}
|
||||
InitializedParentNetworkBehaviour: {fileID: 0}
|
||||
InitializedNestedNetworkObjects: []
|
||||
@@ -142,7 +146,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: -8584169414543529327
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!114 &675340278771037740
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -155,7 +159,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: ee73c1f9305ee50408bbbee938a15194, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Storage.Chest
|
||||
_componentIndexCache: 0
|
||||
_componentIndexCache: 1
|
||||
_addedNetworkObject: {fileID: 8751794752429108}
|
||||
_networkObjectCache: {fileID: 8751794752429108}
|
||||
data: {fileID: 11400000, guid: 38eb565e82ffe934ab6d60830d1d453a, type: 2}
|
||||
|
||||
@@ -239,9 +239,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fe38331f524a7db4cb3d53381b9ea244, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Building.BuiltStructure
|
||||
_componentIndexCache: 255
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 7022851135897287337}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 7022851135897287337}
|
||||
bumpDuration: 0.22
|
||||
startScaleFactor: 0.7
|
||||
bumpEase: 27
|
||||
@@ -287,22 +287,23 @@ MonoBehaviour:
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 65535
|
||||
<PrefabId>k__BackingField: 7
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 7547832251807066330
|
||||
SceneId: 0
|
||||
SerializedTransformProperties:
|
||||
Position: {x: 0, y: 0, z: 0}
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
Scale: {x: 0, y: 0, z: 0}
|
||||
IsValid: 0
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
Scale: {x: 1, y: 1, z: 1}
|
||||
IsValid: 1
|
||||
<IsNested>k__BackingField: 0
|
||||
WasActiveDuringEdit: 0
|
||||
WasActiveDuringEdit_Set1: 1
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
<PredictedOwner>k__BackingField: {fileID: 0}
|
||||
NetworkBehaviours: []
|
||||
NetworkBehaviours:
|
||||
- {fileID: 1224852433561986364}
|
||||
InitializedParentNetworkBehaviour: {fileID: 0}
|
||||
InitializedNestedNetworkObjects: []
|
||||
RuntimeParentNetworkBehaviour: {fileID: 0}
|
||||
@@ -313,7 +314,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: 0
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!1 &7687585878458156323
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -271,9 +271,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fe38331f524a7db4cb3d53381b9ea244, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Building.BuiltStructure
|
||||
_componentIndexCache: 255
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 4444565792432705460}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 4444565792432705460}
|
||||
bumpDuration: 0.22
|
||||
startScaleFactor: 0.7
|
||||
bumpEase: 27
|
||||
@@ -319,22 +319,23 @@ MonoBehaviour:
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 65535
|
||||
<PrefabId>k__BackingField: 14
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 13832512290486259770
|
||||
SceneId: 0
|
||||
SerializedTransformProperties:
|
||||
Position: {x: 0, y: 0, z: 0}
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
Scale: {x: 0, y: 0, z: 0}
|
||||
IsValid: 0
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
Scale: {x: 1, y: 1, z: 1}
|
||||
IsValid: 1
|
||||
<IsNested>k__BackingField: 0
|
||||
WasActiveDuringEdit: 0
|
||||
WasActiveDuringEdit_Set1: 1
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
<PredictedOwner>k__BackingField: {fileID: 0}
|
||||
NetworkBehaviours: []
|
||||
NetworkBehaviours:
|
||||
- {fileID: 2163295442053852858}
|
||||
InitializedParentNetworkBehaviour: {fileID: 0}
|
||||
InitializedNestedNetworkObjects: []
|
||||
RuntimeParentNetworkBehaviour: {fileID: 0}
|
||||
@@ -345,7 +346,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: 0
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!1 &6937546176162827135
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -137,9 +137,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fe38331f524a7db4cb3d53381b9ea244, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Building.BuiltStructure
|
||||
_componentIndexCache: 255
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 7405293751935118856}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 7405293751935118856}
|
||||
bumpDuration: 0.22
|
||||
startScaleFactor: 0.7
|
||||
bumpEase: 27
|
||||
@@ -185,22 +185,23 @@ MonoBehaviour:
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 65535
|
||||
<PrefabId>k__BackingField: 15
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 13925520005596096250
|
||||
SceneId: 0
|
||||
SerializedTransformProperties:
|
||||
Position: {x: 0, y: 0, z: 0}
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
Scale: {x: 0, y: 0, z: 0}
|
||||
IsValid: 0
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
Scale: {x: 1, y: 1, z: 1}
|
||||
IsValid: 1
|
||||
<IsNested>k__BackingField: 0
|
||||
WasActiveDuringEdit: 0
|
||||
WasActiveDuringEdit_Set1: 1
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
<PredictedOwner>k__BackingField: {fileID: 0}
|
||||
NetworkBehaviours: []
|
||||
NetworkBehaviours:
|
||||
- {fileID: 6858850823605817203}
|
||||
InitializedParentNetworkBehaviour: {fileID: 0}
|
||||
InitializedNestedNetworkObjects: []
|
||||
RuntimeParentNetworkBehaviour: {fileID: 0}
|
||||
@@ -211,7 +212,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: 0
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!1 &5016747873711697717
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,110 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b7e9f89bddf5e004d9f51e129188d1fe
|
||||
ModelImporter:
|
||||
serializedVersion: 24200
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 0
|
||||
materialSearch: 1
|
||||
materialLocation: 1
|
||||
animations:
|
||||
legacyGenerateAnimations: 4
|
||||
bakeSimulation: 0
|
||||
resampleCurves: 1
|
||||
optimizeGameObjects: 0
|
||||
removeConstantScaleCurves: 0
|
||||
motionNodeName:
|
||||
animationImportErrors:
|
||||
animationImportWarnings:
|
||||
animationRetargetingWarnings:
|
||||
animationDoRetargetingWarnings: 0
|
||||
importAnimatedCustomProperties: 0
|
||||
importConstraints: 0
|
||||
animationCompression: 1
|
||||
animationRotationError: 0.5
|
||||
animationPositionError: 0.5
|
||||
animationScaleError: 0.5
|
||||
animationWrapMode: 0
|
||||
extraExposedTransformPaths: []
|
||||
extraUserProperties: []
|
||||
clipAnimations: []
|
||||
isReadable: 0
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
meshCompression: 0
|
||||
addColliders: 0
|
||||
useSRGBMaterialColor: 1
|
||||
sortHierarchyByName: 1
|
||||
importPhysicalCameras: 1
|
||||
importVisibility: 1
|
||||
importBlendShapes: 1
|
||||
importCameras: 1
|
||||
importLights: 1
|
||||
nodeNameCollisionStrategy: 1
|
||||
fileIdsGeneration: 2
|
||||
swapUVChannels: 0
|
||||
generateSecondaryUV: 0
|
||||
useFileUnits: 1
|
||||
keepQuads: 0
|
||||
weldVertices: 1
|
||||
bakeAxisConversion: 0
|
||||
preserveHierarchy: 0
|
||||
skinWeightsMode: 0
|
||||
maxBonesPerVertex: 4
|
||||
minBoneWeight: 0.001
|
||||
optimizeBones: 1
|
||||
generateMeshLods: 0
|
||||
meshLodGenerationFlags: 0
|
||||
maximumMeshLod: -1
|
||||
meshOptimizationFlags: -1
|
||||
indexFormat: 0
|
||||
secondaryUVAngleDistortion: 8
|
||||
secondaryUVAreaDistortion: 15.000001
|
||||
secondaryUVHardAngle: 88
|
||||
secondaryUVMarginMethod: 1
|
||||
secondaryUVMinLightmapResolution: 40
|
||||
secondaryUVMinObjectScale: 1
|
||||
secondaryUVPackMargin: 4
|
||||
useFileScale: 1
|
||||
strictVertexDataChecks: 0
|
||||
tangentSpace:
|
||||
normalSmoothAngle: 60
|
||||
normalImportMode: 0
|
||||
tangentImportMode: 3
|
||||
normalCalculationMode: 4
|
||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||
blendShapeNormalImportMode: 1
|
||||
normalSmoothingSource: 0
|
||||
referencedClips: []
|
||||
importAnimation: 1
|
||||
humanDescription:
|
||||
serializedVersion: 3
|
||||
human: []
|
||||
skeleton: []
|
||||
armTwist: 0.5
|
||||
foreArmTwist: 0.5
|
||||
upperLegTwist: 0.5
|
||||
legTwist: 0.5
|
||||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 1
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 0
|
||||
skeletonHasParents: 1
|
||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||
autoGenerateAvatarMappingIfUnspecified: 1
|
||||
animationType: 2
|
||||
humanoidOversampling: 1
|
||||
avatarSetup: 0
|
||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||
importBlendShapeDeformPercent: 1
|
||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||
additionalBone: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -222,7 +222,7 @@ MonoBehaviour:
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 16
|
||||
<PrefabId>k__BackingField: 19
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 16508065741492498975
|
||||
SceneId: 0
|
||||
@@ -249,7 +249,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: -8584169414543529327
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!114 &4182754159189231312
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -87,7 +87,7 @@ MonoBehaviour:
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 14
|
||||
<PrefabId>k__BackingField: 17
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 15960435111263854789
|
||||
SceneId: 0
|
||||
@@ -114,7 +114,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: -8584169414543529327
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!114 &4872016000618054028
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -88,7 +88,7 @@ MonoBehaviour:
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 9
|
||||
<PrefabId>k__BackingField: 10
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 9001145751081742879
|
||||
SceneId: 0
|
||||
@@ -115,7 +115,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: -8584169414543529327
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!114 &5061449885792543640
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -596,7 +596,7 @@ MonoBehaviour:
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 20
|
||||
<PrefabId>k__BackingField: 23
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 17746024873254907359
|
||||
SceneId: 0
|
||||
@@ -623,7 +623,7 @@ MonoBehaviour:
|
||||
_initializeOrder: 0
|
||||
_preventDespawnOnDisconnect: 0
|
||||
_defaultDespawnType: 0
|
||||
_initializedTimestamp: -8584169414543529327
|
||||
_initializedTimestamp: -8584168773125460856
|
||||
--- !u!114 &5834036106823394854
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user