Compare commits

..

No commits in common. "f3e3868ef19df9053cc6c4d94ac2097bd20eab33" and "735af33de4e12c438a2a7f9f369fda2149ccadcd" have entirely different histories.

717 changed files with 965 additions and 742207 deletions

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: bdc4995e29f7bb44fbd84ac9a96ef5f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 06c4d8df90b02894d866a9d7d3ebbcdd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 66c4c05934d34f649b93699fd5ee66d8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 763c0761dbea2494da2b4ade997cc93a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 35b149b905f5c4645896e69ce79c884a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 530002ea215aa2a4a913e0eb4107a8b9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 0794742d7d4be8242b3a0fd27cae7c13
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 7c61f3f07a2933941bb654d4db478844
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,83 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: grey 1
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.46540874, g: 0.42589286, b: 0.42589286, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 7472676c6611f8d46aa7ef7883ab15b4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,83 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: wood 1
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.8805031, g: 0.72083116, b: 0.4014872, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: fda5a935860dd894f9e76eb28c90bcb5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] extraUserProperties: []
clipAnimations: [] clipAnimations: []
isReadable: 1 isReadable: 0
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1

View File

@ -26,14 +26,14 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1642849806601844052} m_GameObject: {fileID: 1642849806601844052}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalRotation: {x: -0.45202562, y: 0.5437581, z: 0.543758, w: 0.4520257}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 7, y: 7, z: 7} m_LocalScale: {x: 7, y: 7, z: 7}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 6557370512938168053} - {fileID: 6557370512938168053}
m_Father: {fileID: 4084511099481264227} m_Father: {fileID: 4084511099481264227}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6800816504686247129 --- !u!33 &6800816504686247129
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -177,6 +177,9 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4084511099481264227} - component: {fileID: 4084511099481264227}
- component: {fileID: 976052262833531566}
- component: {fileID: 7270411851895590608}
- component: {fileID: 3825317841902353598}
m_Layer: 0 m_Layer: 0
m_Name: CoffeMug_Red m_Name: CoffeMug_Red
m_TagString: Untagged m_TagString: Untagged
@ -193,10 +196,75 @@ Transform:
m_GameObject: {fileID: 8540413964132331813} m_GameObject: {fileID: 8540413964132331813}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 21.273, y: 1.2736846, z: -5.037}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 2698982615918444838} - {fileID: 2698982615918444838}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &976052262833531566
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8540413964132331813}
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: 0.08, y: 0.1, z: 0.08}
m_Center: {x: 0, y: 0.05, z: 0}
--- !u!136 &7270411851895590608
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8540413964132331813}
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: 2
m_Radius: 0.07
m_Height: 0.16
m_Direction: 1
m_Center: {x: 0, y: 0.08, z: 0}
--- !u!65 &3825317841902353598
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8540413964132331813}
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: 0.03, y: 0.12, z: 0.07}
m_Center: {x: 0, y: 0.08, z: 0.09}

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4255048076057006431 --- !u!1001 &3935261990060072114
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
@ -8,56 +8,56 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 2893721198514633483, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2103754823035124799, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_Materials.Array.data[0] propertyPath: m_Name
value: value: Coffee_Pickupable_Blue Variant
objectReference: {fileID: 2100000, guid: 0188b986a52a983489aab29f1630f757, type: 2} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 21.409637
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 1.2736847
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -5.0370345
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7277775400988020951, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}
propertyPath: m_Name propertyPath: m_Materials.Array.data[0]
value: CoffeMug_Blue value:
objectReference: {fileID: 0} objectReference: {fileID: 2100000, guid: 0188b986a52a983489aab29f1630f757, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3d89768246390a54ca0bc24199d7e982, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: da946566dd3a518488f26f0ccd547e57 guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,231 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5778247514781970299
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7893531080884699271}
- component: {fileID: 8850766705489312849}
- component: {fileID: 4629894269612581168}
- component: {fileID: 6730156945272532712}
- component: {fileID: 6428708572223952086}
- component: {fileID: 1427178841018934511}
- component: {fileID: 5392139150809204757}
m_Layer: 8
m_Name: Coffee_Pickupable_Blue
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7893531080884699271
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7855185132366827283}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8850766705489312849
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4cae243dedd2499e8326b9ed6de6e32e, type: 3}
m_Name:
m_EditorClassIdentifier:
_outline: {fileID: 6730156945272532712}
_selectedColor: {r: 1, g: 1, b: 1, a: 1}
_highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
_model: {fileID: 5587087994976919674, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
_name: Kaffee
_itemType: 1
UsesLeft: 1
--- !u!54 &4629894269612581168
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &6730156945272532712
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 0
outlineColor: {r: 1, g: 1, b: 0, a: 1}
outlineWidth: 2
precomputeOutline: 0
bakeKeys: []
bakeValues: []
--- !u!65 &6428708572223952086
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 0.08, y: 0.1, z: 0.08}
m_Center: {x: 0, y: 0.05, z: 0}
--- !u!136 &1427178841018934511
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 2
m_Radius: 0.07
m_Height: 0.16
m_Direction: 1
m_Center: {x: 0, y: 0.08, z: 0}
--- !u!65 &5392139150809204757
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 0.07, y: 0.12, z: 0.03}
m_Center: {x: -0.09, y: 0.08, z: 0}
--- !u!1001 &7971608665264836143
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7893531080884699271}
m_Modifications:
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5587087994976919674, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
propertyPath: m_Name
value: CoffeMug_Blue
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
--- !u!4 &7855185132366827283 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3}
m_PrefabInstance: {fileID: 7971608665264836143}
m_PrefabAsset: {fileID: 0}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 9847b3330677a894da44800d037d64a8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2287015152359431421 --- !u!1001 &5549134432018436932
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
@ -8,56 +8,56 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 2893721198514633483, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 3025757556802749331, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_Materials.Array.data[0] propertyPath: m_Materials.Array.data[0]
value: value:
objectReference: {fileID: 2100000, guid: 584cab1673da6f9429f5001bbb67c71f, type: 2} objectReference: {fileID: 2100000, guid: 584cab1673da6f9429f5001bbb67c71f, type: 2}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_Name
value: Coffee_Pickupable_Green Variant
objectReference: {fileID: 0}
- target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 21.409637
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 1.2736847
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -5.0370345
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_Name
value: CoffeMug_Green
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a4a282cdf62321745a8cc90b1a9e9f84 guid: 3d89768246390a54ca0bc24199d7e982
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,231 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5778247514781970299
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7893531080884699271}
- component: {fileID: 8850766705489312849}
- component: {fileID: 4629894269612581168}
- component: {fileID: 6730156945272532712}
- component: {fileID: 6428708572223952086}
- component: {fileID: 1427178841018934511}
- component: {fileID: 5392139150809204757}
m_Layer: 8
m_Name: Coffee_Pickupable_Green
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7893531080884699271
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2842256026194269089}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8850766705489312849
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4cae243dedd2499e8326b9ed6de6e32e, type: 3}
m_Name:
m_EditorClassIdentifier:
_outline: {fileID: 6730156945272532712}
_selectedColor: {r: 1, g: 1, b: 1, a: 1}
_highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
_model: {fileID: 7582013836232060376, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
_name: Kaffee
_itemType: 1
UsesLeft: 1
--- !u!54 &4629894269612581168
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &6730156945272532712
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 0
outlineColor: {r: 1, g: 1, b: 0, a: 1}
outlineWidth: 2
precomputeOutline: 0
bakeKeys: []
bakeValues: []
--- !u!65 &6428708572223952086
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 0.08, y: 0.1, z: 0.08}
m_Center: {x: 0, y: 0.05, z: 0}
--- !u!136 &1427178841018934511
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 2
m_Radius: 0.07
m_Height: 0.16
m_Direction: 1
m_Center: {x: 0, y: 0.08, z: 0}
--- !u!65 &5392139150809204757
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 0.07, y: 0.12, z: 0.03}
m_Center: {x: -0.09, y: 0.08, z: 0}
--- !u!1001 &28074731125907263
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7893531080884699271}
m_Modifications:
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7582013836232060376, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
propertyPath: m_Name
value: CoffeMug_Green
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
--- !u!4 &2842256026194269089 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3}
m_PrefabInstance: {fileID: 28074731125907263}
m_PrefabAsset: {fileID: 0}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,173 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &2366692909638124840
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4566749170246607944}
- component: {fileID: 6275547677232702803}
- component: {fileID: 5005523705496298504}
m_Layer: 0
m_Name: Cylinder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4566749170246607944
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2366692909638124840}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0, z: 0.01714}
m_LocalScale: {x: 0.018, y: 0.001, z: 0.018}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1839388367657682940}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &6275547677232702803
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2366692909638124840}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5005523705496298504
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2366692909638124840}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 43fefe435be6d2445b5f3ea806e389bd, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &5045726997220857227
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1839388367657682940}
- component: {fileID: 7234814574197454412}
- component: {fileID: 3025757556802749331}
m_Layer: 0
m_Name: Coffee-Mug
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1839388367657682940
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5045726997220857227}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: -0, z: 0}
m_LocalScale: {x: 7, y: 7, z: 7}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 4566749170246607944}
m_Father: {fileID: 7893531080884699271}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!33 &7234814574197454412
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5045726997220857227}
m_Mesh: {fileID: -257304525049604202, guid: 00c65ec9e68a3514a92a63f1961301cd, type: 3}
--- !u!23 &3025757556802749331
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5045726997220857227}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 57d9d3e7a3b719145b2bbf26fd15c468, type: 2}
- {fileID: 548022048751648564, guid: 00c65ec9e68a3514a92a63f1961301cd, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &5778247514781970299 --- !u!1 &5778247514781970299
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -31,11 +199,11 @@ Transform:
m_GameObject: {fileID: 5778247514781970299} m_GameObject: {fileID: 5778247514781970299}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 30.877092, y: 0.576, z: -3.8830667}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 2279061541069407870} - {fileID: 1839388367657682940}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8850766705489312849 --- !u!114 &8850766705489312849
@ -53,7 +221,7 @@ MonoBehaviour:
_outline: {fileID: 6730156945272532712} _outline: {fileID: 6730156945272532712}
_selectedColor: {r: 1, g: 1, b: 1, a: 1} _selectedColor: {r: 1, g: 1, b: 1, a: 1}
_highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
_model: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} _model: {fileID: 7350709013579755407, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3}
_name: Kaffee _name: Kaffee
_itemType: 1 _itemType: 1
UsesLeft: 1 UsesLeft: 1
@ -167,65 +335,3 @@ BoxCollider:
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 0.07, y: 0.12, z: 0.03} m_Size: {x: 0.07, y: 0.12, z: 0.03}
m_Center: {x: -0.09, y: 0.08, z: 0} m_Center: {x: -0.09, y: 0.08, z: 0}
--- !u!1001 &2814683048095438365
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7893531080884699271}
m_Modifications:
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_Name
value: CoffeMug_Red
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
--- !u!4 &2279061541069407870 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
m_PrefabInstance: {fileID: 2814683048095438365}
m_PrefabAsset: {fileID: 0}

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4087360594576994023 --- !u!1001 &181638966724076986
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
@ -8,56 +8,56 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 2893721198514633483, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 59694902c73654440aab07a65436dbc3, type: 2}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 21.409637
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 1.2736847
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -5.0370345
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} - target: {fileID: 3147684308716970125, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: CoffeMug_Yellow value: Coffee_Pickupable_Yellow Variant
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5936590679111568485, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 59694902c73654440aab07a65436dbc3, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 938a31826b0885c4da3932f8d394b944 guid: 37e1c4b5254279141bdb120a465d20d5
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,231 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5778247514781970299
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7893531080884699271}
- component: {fileID: 8850766705489312849}
- component: {fileID: 4629894269612581168}
- component: {fileID: 6730156945272532712}
- component: {fileID: 6428708572223952086}
- component: {fileID: 1427178841018934511}
- component: {fileID: 5392139150809204757}
m_Layer: 8
m_Name: Coffee_Pickupable_Yellow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7893531080884699271
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6921989200499177893}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8850766705489312849
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4cae243dedd2499e8326b9ed6de6e32e, type: 3}
m_Name:
m_EditorClassIdentifier:
_outline: {fileID: 6730156945272532712}
_selectedColor: {r: 1, g: 1, b: 1, a: 1}
_highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
_model: {fileID: 5637554067884761026, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
_name: Kaffee
_itemType: 1
UsesLeft: 1
--- !u!54 &4629894269612581168
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &6730156945272532712
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 0
outlineColor: {r: 1, g: 1, b: 0, a: 1}
outlineWidth: 2
precomputeOutline: 0
bakeKeys: []
bakeValues: []
--- !u!65 &6428708572223952086
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 0.08, y: 0.1, z: 0.08}
m_Center: {x: 0, y: 0.05, z: 0}
--- !u!136 &1427178841018934511
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 2
m_Radius: 0.07
m_Height: 0.16
m_Direction: 1
m_Center: {x: 0, y: 0.08, z: 0}
--- !u!65 &5392139150809204757
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778247514781970299}
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: 0.07, y: 0.12, z: 0.03}
m_Center: {x: -0.09, y: 0.08, z: 0}
--- !u!1001 &6924840207457945377
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7893531080884699271}
m_Modifications:
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5637554067884761026, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
propertyPath: m_Name
value: CoffeMug_Yellow
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
--- !u!4 &6921989200499177893 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3}
m_PrefabInstance: {fileID: 6924840207457945377}
m_PrefabAsset: {fileID: 0}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 00115013d00b60b4b910de00e97c8934
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1181,7 +1181,6 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3603909376357075794} - {fileID: 3603909376357075794}
- {fileID: 7588121059722506457}
m_Father: {fileID: 5060876231321218156} m_Father: {fileID: 5060876231321218156}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4907209547097802691 --- !u!1 &4907209547097802691
@ -2488,37 +2487,6 @@ Transform:
- {fileID: 9159352572297857806} - {fileID: 9159352572297857806}
m_Father: {fileID: 1569112875850845949} m_Father: {fileID: 1569112875850845949}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8770957046814480106
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7588121059722506457}
m_Layer: 0
m_Name: ItemHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7588121059722506457
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8770957046814480106}
serializedVersion: 2
m_LocalRotation: {x: -0.5, y: -0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: -0, y: 0.00193, z: 0.00078}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5737504958030667471}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 90}
--- !u!1 &9017657623670109072 --- !u!1 &9017657623670109072
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2529,16 +2497,8 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 958156999735417459} - component: {fileID: 958156999735417459}
- component: {fileID: 3172532130436993162} - component: {fileID: 3172532130436993162}
- component: {fileID: 5522155941026358655}
- component: {fileID: 7238905383007695838}
- component: {fileID: 8480748577330701233}
- component: {fileID: 2854474547678719636}
- component: {fileID: 4818504893248395498}
- component: {fileID: 8130449438919791664}
- component: {fileID: 4312745187559847804}
- component: {fileID: 3895211860080867177}
m_Layer: 0 m_Layer: 0
m_Name: Gottfried m_Name: Gottfried new
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -2582,10 +2542,10 @@ Animator:
m_GameObject: {fileID: 9017657623670109072} m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1 m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: e72f76f2e07d78347bb29ae6cefa1f12, type: 3} m_Avatar: {fileID: 9000000, guid: e72f76f2e07d78347bb29ae6cefa1f12, type: 3}
m_Controller: {fileID: 9100000, guid: d606e87912042554fa99cc851df355d0, type: 2} m_Controller: {fileID: 0}
m_CullingMode: 1 m_CullingMode: 1
m_UpdateMode: 0 m_UpdateMode: 0
m_ApplyRootMotion: 0 m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0 m_LinearVelocityBlending: 0
m_StabilizeFeet: 0 m_StabilizeFeet: 0
m_WarningMessage: m_WarningMessage:
@ -2593,362 +2553,3 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0 m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0 m_WriteDefaultValuesOnDisable: 0
--- !u!114 &5522155941026358655
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 740b300bbbdc1fa4f9acfc855c8670de, type: 3}
m_Name:
m_EditorClassIdentifier:
_animator: {fileID: 3172532130436993162}
_movementAcceleration: 50
groundDrag: 4
_maxVelocity: 5
turningRate: 600
_targetRotation: {x: 0, y: 0, z: 0, w: 1}
jumpForce: 40
jumpCooldown: 0.5
_groundedTolerance: 0.2
_groundLayerMask:
serializedVersion: 2
m_Bits: 8
_hand: {fileID: 7588121059722506457}
_carriedItemModel: {fileID: 0}
_carriedInteractible: {fileID: 0}
_dropItemForce: 3
_data: {fileID: 11400000, guid: 503e4ea097b9faa4ba6e2ed3906714a5, type: 2}
_audioSource: {fileID: 8130449438919791664}
--- !u!114 &7238905383007695838
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ba80be7ffa6083b4ba706b603a9b812e, type: 3}
m_Name:
m_EditorClassIdentifier:
_character: {fileID: 5522155941026358655}
interactionRadius: 1
_interactionCollider: {fileID: 4818504893248395498}
_interactionsInRange: []
--- !u!54 &8480748577330701233
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
serializedVersion: 4
m_Mass: 10
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!136 &2854474547678719636
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
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: 2
m_Radius: 0.2
m_Height: 1.54
m_Direction: 1
m_Center: {x: 0, y: 0.78, z: 0}
--- !u!136 &4818504893248395498
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Height: 4.5
m_Direction: 1
m_Center: {x: 0, y: 0.75, z: 0}
--- !u!82 &8130449438919791664
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &4312745187559847804
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: fb2e9958e9ec8d24c836f615c25410f8, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5522155941026358655}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoJump
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 7f3b63a1-be87-41ca-ad1b-19f55d303089
m_ActionName: Player/Jump
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5522155941026358655}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoMove
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8b6b0ff-5561-4ddc-b2bd-66e2fef329a0
m_ActionName: Player/Walk
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5522155941026358655}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoDropItem
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 1fbac6ab-15a0-4a9c-ab41-f1657cfe70f6
m_ActionName: Player/Drop Item
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7238905383007695838}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoInteract
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 48a90872-b876-4bfd-b3fb-e9d66df8b6a4
m_ActionName: Player/Interact[/Keyboard/e,/XInputControllerWindows/buttonWest]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7238905383007695838}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectPreviousAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 82379c74-be3b-419a-8663-4d6235bf1585
m_ActionName: Player/Select Previous Action[/Keyboard/leftArrow,/XInputControllerWindows/dpad/left]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7238905383007695838}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectNextAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8df853a-df28-4087-8356-bb64a7a81c51
m_ActionName: Player/Select Next Action[/Keyboard/rightArrow,/XInputControllerWindows/dpad/right]
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &3895211860080867177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017657623670109072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 2
outlineColor: {r: 1, g: 0.60691816, b: 0.60691816, a: 1}
outlineWidth: 2
precomputeOutline: 0
bakeKeys: []
bakeValues: []

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: a8e644329c3fb994ca3e59d4f5c20029
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f8c83d740b2f02842b49e70dfa364ff6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 94c5a9dfc8ba25641af41400a2bdcfee
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More