diff --git a/3d Prototyp/Assets/Prefabs/Office/Office_Boden.prefab b/3d Prototyp/Assets/Prefabs/Office/Office_Boden.prefab index d7da5b72..0483def2 100644 --- a/3d Prototyp/Assets/Prefabs/Office/Office_Boden.prefab +++ b/3d Prototyp/Assets/Prefabs/Office/Office_Boden.prefab @@ -58,12 +58,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 96c8f49ed5da83645a2e95d7af1a1dd6, type: 2} - target: {fileID: 919132149155446097, guid: b2a58bff693e940b0bd58bc12b2218be, type: 3} propertyPath: m_Name - value: toon__office_tile_ground_low_4x4 (2) + value: Office_Boden objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: b2a58bff693e940b0bd58bc12b2218be, type: 3} propertyPath: m_Layer value: 3 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: b2a58bff693e940b0bd58bc12b2218be, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/3d Prototyp/Assets/Prefabs/Office/Tür.prefab b/3d Prototyp/Assets/Prefabs/Office/Tür.prefab index f3648172..ba37fbeb 100644 --- a/3d Prototyp/Assets/Prefabs/Office/Tür.prefab +++ b/3d Prototyp/Assets/Prefabs/Office/Tür.prefab @@ -58,12 +58,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: fcdb7a99237c6417a9e5766d641a824c, type: 2} - target: {fileID: 919132149155446097, guid: f45f023caa61a4c70a5b476c42c8991d, type: 3} propertyPath: m_Name - value: toon_office_tile_wall_door (3) + value: "T\xFCr" objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: f45f023caa61a4c70a5b476c42c8991d, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f45f023caa61a4c70a5b476c42c8991d, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -231,6 +235,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b6be710e946b84c79bfa5da05149a9b8, type: 3} insertIndex: -1 addedObject: {fileID: 5228526413181235752} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b6be710e946b84c79bfa5da05149a9b8, type: 3} + insertIndex: -1 + addedObject: {fileID: 8744120041602390242} m_SourcePrefab: {fileID: 100100000, guid: b6be710e946b84c79bfa5da05149a9b8, type: 3} --- !u!1 &1708877355226101842 stripped GameObject: @@ -324,6 +331,25 @@ HingeJoint: m_EnablePreprocessing: 1 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &8744120041602390242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708877355226101842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OverrideArea: 0 + m_Area: 0 + m_OverrideGenerateLinks: 0 + m_GenerateLinks: 0 + m_IgnoreFromBuild: 1 + m_ApplyToChildren: 1 + m_AffectedAgents: ffffffff --- !u!4 &2088815125154079464 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b6be710e946b84c79bfa5da05149a9b8, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Office/Wand.prefab b/3d Prototyp/Assets/Prefabs/Office/Wand.prefab index cdf61fad..3395b8fa 100644 --- a/3d Prototyp/Assets/Prefabs/Office/Wand.prefab +++ b/3d Prototyp/Assets/Prefabs/Office/Wand.prefab @@ -58,7 +58,11 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: fcdb7a99237c6417a9e5766d641a824c, type: 2} - target: {fileID: 919132149155446097, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} propertyPath: m_Name - value: toon_office_tile_wall (4) + value: Wand + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index a96a4a12..87b49baa 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -59435,6 +59435,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1849344296} + - component: {fileID: 1849344297} m_Layer: 0 m_Name: mockup m_TagString: Untagged @@ -59470,6 +59471,37 @@ Transform: - {fileID: 2012357350} m_Father: {fileID: 1274270891} m_LocalEulerAnglesHint: {x: 0, y: 120, z: 0} +--- !u!114 &1849344297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1849344295} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.033333335 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: 2dfcf1d6818e2bc40a60b5ec277dc542, type: 2} + m_BuildHeightMesh: 0 --- !u!1 &1850248162 GameObject: m_ObjectHideFlags: 0 diff --git a/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-NavMesh Surface.asset b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-NavMesh Surface.asset new file mode 100644 index 00000000..0bbd04d5 Binary files /dev/null and b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-NavMesh Surface.asset differ diff --git a/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-toon__office_tile_ground_low_4x4 (2).asset.meta b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-NavMesh Surface.asset.meta similarity index 79% rename from 3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-toon__office_tile_ground_low_4x4 (2).asset.meta rename to 3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-NavMesh Surface.asset.meta index 012398ad..36514c2a 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-toon__office_tile_ground_low_4x4 (2).asset.meta +++ b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-NavMesh Surface.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e4474ece4dc94444ac3f171ca578287 +guid: 43d6c78b071be304bb4fcf3cbc87e5ef NativeFormatImporter: externalObjects: {} mainObjectFileID: 23800000 diff --git a/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-mockup.asset b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-mockup.asset new file mode 100644 index 00000000..746b0910 Binary files /dev/null and b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-mockup.asset differ diff --git a/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-mockup.asset.meta b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-mockup.asset.meta new file mode 100644 index 00000000..11f86ae1 --- /dev/null +++ b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-mockup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2dfcf1d6818e2bc40a60b5ec277dc542 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-toon__office_tile_ground_low_4x4 (2).asset b/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-toon__office_tile_ground_low_4x4 (2).asset deleted file mode 100644 index 55c8fd96..00000000 Binary files a/3d Prototyp/Assets/Scenes/GameJamScene/NavMesh-toon__office_tile_ground_low_4x4 (2).asset and /dev/null differ diff --git a/3d Prototyp/Assets/UMotionEditor/Data/EditorUndoStackPointer.asset b/3d Prototyp/Assets/UMotionEditor/Data/EditorUndoStackPointer.asset index 07ee1833..994921ff 100644 --- a/3d Prototyp/Assets/UMotionEditor/Data/EditorUndoStackPointer.asset +++ b/3d Prototyp/Assets/UMotionEditor/Data/EditorUndoStackPointer.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: -1063058285, guid: 448d62fcada76fd4ab5702190add98fd, type: 3} m_Name: EditorUndoStackPointer m_EditorClassIdentifier: - "\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u0389\u038A\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u038A": 1.29p03 - "\u038A\u038A\u0389\u038A\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u038A\u0389\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389": 17 + "\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u0389\u038A\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u038A": + "\u038A\u038A\u0389\u038A\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u038A\u0389\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389": -1