Skip to content

GitLab

Commit c03537c5 authored by Marcel Bieg's avatar Marcel Bieg
Browse files

Merge branch 'master' of... 

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Graphics/Druckplatte.png.meta
#	Assets/_Game/Prefabs/Druckplatte.prefab
parents 010f5f7b 6d151f9c
Expand all Hide whitespace changes
Inline Side-by-side
Assets/_Game/Scenes/Level 0 Toxic.unity
View file @ c03537c5
......@@ -4603,6 +4603,8 @@ Transform:
m_Children:
- {fileID: 1134589567}
- {fileID: 1544806639}
- {fileID: 1721002538}
- {fileID: 1894386503}
m_Father: {fileID: 18475766}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -5323,7 +5325,7 @@ PrefabInstance:
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
propertyPath: m_TileSpriteArray.Array.data[4].m_RefCount
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
......@@ -5990,7 +5992,7 @@ PrefabInstance:
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
propertyPath: m_TileSpriteArray.Array.data[6].m_RefCount
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
......@@ -7580,7 +7582,7 @@ PrefabInstance:
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
propertyPath: m_Tiles.Array.data[40].second.m_TileSpriteIndex
value: 4
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
......@@ -8678,7 +8680,8 @@ PrefabInstance:
type: 3}
propertyPath: m_TileSpriteArray.Array.data[6].m_Data
value:
objectReference: {fileID: 0}
objectReference: {fileID: -305438750493385476, guid: 2dd57e5ca4ee5c44db8e68e6070e4355,
type: 3}
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
propertyPath: m_Tiles.Array.data[6].first.y
......@@ -8874,8 +8877,7 @@ PrefabInstance:
type: 3}
propertyPath: m_TileSpriteArray.Array.data[4].m_Data
value:
objectReference: {fileID: -305438750493385476, guid: 2dd57e5ca4ee5c44db8e68e6070e4355,
type: 3}
objectReference: {fileID: 0}
- target: {fileID: 4029721591230422445, guid: f1c8b8e2bbbf267439da31021c6bf380,
type: 3}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e00
......@@ -9875,6 +9877,86 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1714756667}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1721002537
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1721002538}
- component: {fileID: 1721002539}
m_Layer: 0
m_Name: Fertiger_Nebel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1721002538
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1721002537}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6, y: 0.7, z: 0}
m_LocalScale: {x: 6, y: 9, z: 1}
m_Children: []
m_Father: {fileID: 1390188727}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1721002539
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1721002537}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
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: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 777780895
m_SortingLayer: 5
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: e5de076237f333f48accf3b0e6204d44, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.32, y: 0.32}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1733177197
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -10031,6 +10113,86 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1836122567}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1894386502
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1894386503}
- component: {fileID: 1894386504}
m_Layer: 0
m_Name: Fertiger_Nebel (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1894386503
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894386502}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6, y: -1.73, z: 0}
m_LocalScale: {x: 6, y: 9, z: 1}
m_Children: []
m_Father: {fileID: 1390188727}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1894386504
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894386502}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
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: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 777780895
m_SortingLayer: 5
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: e5de076237f333f48accf3b0e6204d44, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.32, y: 0.32}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1900371296
PrefabInstance:
m_ObjectHideFlags: 0
......
Assets/_Game/Scenes/Level 1.unity
View file @ c03537c5
This diff is collapsed.
Assets/_Game/Sprites/Player/Turn.meta → Assets/_Game/Sprites/Tilesets/TileSet.meta
View file @ c03537c5
fileFormatVersion: 2
guid: 3729dbd5d694ba447b2a39be3bb3397a
guid: 463ba267aa2a4e24f9d1125f77677ea1
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment