Commit ed4a70fd authored by Mikael Perilä's avatar Mikael Perilä
Browse files

Merge branch 'master' of https://git.bitbybyte.fi/game-jam/fgj-19 into graphics-elperi

parents 79eb352a 455a24ba
......@@ -30,7 +30,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 42.004066, y: -0.495, z: 5.077567}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 7666486061364599639}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -106,5 +107,49 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.48950702, y: 1.2168951, z: 0.59829235}
m_Center: {x: 0, y: 0.60464334, z: -0.13600633}
m_Size: {x: 0.48950702, y: 1.2168951, z: 0.11}
m_Center: {x: 0, y: 0.60464334, z: -0.38}
--- !u!1 &9083801032604063881
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7666486061364599639}
- component: {fileID: 4924272440925072098}
m_Layer: 11
m_Name: bot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7666486061364599639
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9083801032604063881}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.247, z: -0.07}
m_LocalScale: {x: 0.52094, y: 0.53455, z: 0.44856286}
m_Children: []
m_Father: {fileID: 7209866394037559973}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &4924272440925072098
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9083801032604063881}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
This diff is collapsed.
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2263662633408114538
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6307542905026624259}
- component: {fileID: 4406925211980563729}
- component: {fileID: 3741941008092222296}
- component: {fileID: 8916897230260261219}
- component: {fileID: 6361187432699349853}
m_Layer: 0
m_Name: tree_c
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6307542905026624259
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2263662633408114538}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -22.155518, y: 5, z: -16.067238}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4406925211980563729
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2263662633408114538}
m_Mesh: {fileID: 4300000, guid: b2fbf33844166f447875af48fb38d3dc, type: 3}
--- !u!23 &3741941008092222296
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2263662633408114538}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b8e82f7625bc35e45bc5d380532fa087, type: 2}
- {fileID: 2100000, guid: 2772c74f6361879409221eb29b573be7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
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
--- !u!135 &8916897230260261219
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2263662633408114538}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 6
m_Center: {x: 0.9462049, y: 4.8761973, z: -1.4062409}
--- !u!114 &6361187432699349853
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2263662633408114538}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f99a054b82ff7d24aa601aa3a52bf790, type: 3}
m_Name:
m_EditorClassIdentifier:
data: {fileID: 11400000, guid: 2e18f8e2ddfb2aa4293e8cbf3d861498, type: 2}
repeatType: 0
RepeatLimit: 3
RepeatInterval: 1
fileFormatVersion: 2
guid: ed7cb27e22040c54b8213af629fabdda
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4124979397226019993
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8315865272848423087}
- component: {fileID: 5414821389563277396}
- component: {fileID: 3110830090281378006}
- component: {fileID: 8354610200565739449}
- component: {fileID: 7195785433132434085}
m_Layer: 0
m_Name: tree_f
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8315865272848423087
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4124979397226019993}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -7.8883476, y: 4.999999, z: -15.1156025}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5414821389563277396
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4124979397226019993}
m_Mesh: {fileID: 4300000, guid: d6390f08259b01b48ab6f39baec54113, type: 3}
--- !u!23 &3110830090281378006
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4124979397226019993}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b8e82f7625bc35e45bc5d380532fa087, type: 2}
- {fileID: 2100000, guid: 2772c74f6361879409221eb29b573be7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
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
--- !u!135 &8354610200565739449
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4124979397226019993}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 6
m_Center: {x: -0.107957125, y: 5.0642414, z: 0.651235}
--- !u!114 &7195785433132434085
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4124979397226019993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f99a054b82ff7d24aa601aa3a52bf790, type: 3}
m_Name:
m_EditorClassIdentifier:
data: {fileID: 11400000, guid: 2e18f8e2ddfb2aa4293e8cbf3d861498, type: 2}
repeatType: 0
RepeatLimit: 3
RepeatInterval: 1
fileFormatVersion: 2
guid: ff1c835bd822f5a41b58c8d048b07652
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5957070170603058069
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3270890396641913635}
- component: {fileID: 5992750483029329275}
- component: {fileID: 3541452729349008266}
- component: {fileID: 2446592113506370041}
- component: {fileID: 6927041553464603882}
m_Layer: 0
m_Name: tree_h
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3270890396641913635
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957070170603058069}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -16.701855, y: 5, z: -20.328041}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5992750483029329275
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957070170603058069}
m_Mesh: {fileID: 4300000, guid: fd8085ede81f6dd4481420a9e77b93c9, type: 3}
--- !u!23 &3541452729349008266
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957070170603058069}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b8e82f7625bc35e45bc5d380532fa087, type: 2}
- {fileID: 2100000, guid: 2772c74f6361879409221eb29b573be7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
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
--- !u!135 &2446592113506370041
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957070170603058069}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 6
m_Center: {x: 0.8274431, y: 4.5266175, z: -0.73536503}
--- !u!114 &6927041553464603882
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957070170603058069}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f99a054b82ff7d24aa601aa3a52bf790, type: 3}
m_Name:
m_EditorClassIdentifier:
data: {fileID: 11400000, guid: 2e18f8e2ddfb2aa4293e8cbf3d861498, type: 2}
repeatType: 0
RepeatLimit: 3
RepeatInterval: 1
fileFormatVersion: 2
guid: 7b29e8cbcdc52d443b3c52de418dbc07
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -384,24 +384,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d93d75dc86b3543419ff8b10d56b6d83, type: 3}
--- !u!1 &144357958 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4485577686923757799, guid: 79298a366fb547947866d473c8312f84,
type: 3}
m_PrefabInstance: {fileID: 1102477311}
m_PrefabAsset: {fileID: 0}
--- !u!114 &144357962
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 144357958}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 972e852915fc54b428dc7d4b28321a0e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &159780503
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -790,26 +772,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880784250}
m_CullTransparentMesh: 0
--- !u!1 &1024254974 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4485577686923757795, guid: 79298a366fb547947866d473c8312f84,
type: 3}
m_PrefabInstance: {fileID: 1102477311}
m_PrefabAsset: {fileID: 0}
--- !u!64 &1024254978
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024254974}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 14
m_Mesh: {fileID: 4300004, guid: e583e81baf59a7a4484eff26ef5a0489, type: 3}
--- !u!1001 &1102477311
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -877,82 +839,68 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4218322231061076475, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 3974593370167396833, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.488
propertyPath: m_LocalPosition.x
value: 0.712
objectReference: {fileID: 0}
- target: {fileID: 2300837239712154152, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 3974593370167396833, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.618
objectReference: {fileID: 0}
- target: {fileID: 7209866395080959953, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.923
value: 0.578
objectReference: {fileID: 0}
- target: {fileID: 2300837239712154152, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 7209866395080959953, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.222
value: -1.245
objectReference: {fileID: 0}
- target: {fileID: 2300837239712154152, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 7209866394973231345, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.001
propertyPath: m_LocalPosition.x
value: -0.681
objectReference: {fileID: 0}
- target: {fileID: 7756174398508944692, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 7209866394973231345, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.956
propertyPath: m_LocalPosition.z
value: -1.28
objectReference: {fileID: 0}
- target: {fileID: 7756174397235534539, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 7209866394071136882, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.962
objectReference: {fileID: 0}
- target: {fileID: 924637269, guid: 79298a366fb547947866d473c8312f84, type: 3}
propertyPath: m_AutoConfigureConnectedAnchor
value: 1
propertyPath: m_LocalPosition.x
value: -0.665
objectReference: {fileID: 0}
- target: {fileID: 924637269, guid: 79298a366fb547947866d473c8312f84, type: 3}
propertyPath: m_ConnectedAnchor.x
value: -21.207775
- target: {fileID: 7209866394071136882, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.484
objectReference: {fileID: 0}
- target: {fileID: 924637269, guid: 79298a366fb547947866d473c8312f84, type: 3}
propertyPath: m_ConnectedAnchor.y
value: 9.498
- target: {fileID: 2816259025369180772, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_Size.x
value: 2.03
objectReference: {fileID: 0}
- target: {fileID: 924637269, guid: 79298a366fb547947866d473c8312f84, type: 3}
propertyPath: m_ConnectedAnchor.z
value: -7.6000004
- target: {fileID: 2816259025369180772, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_Size.z
value: 1.19
objectReference: {fileID: 0}
- target: {fileID: 2872676014164985993, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 2816259025369180772, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.016
propertyPath: m_Size.y
value: 0.19
objectReference: {fileID: 0}
- target: {fileID: 6419837852526376678, guid: 79298a366fb547947866d473c8312f84,
- target: {fileID: 2816259025369180772, guid: 79298a366fb547947866d473c8312f84,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.001
propertyPath: m_Center.y
value: 0.78
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 79298a366fb547947866d473c8312f84, type: 3}
--- !u!1 &1254529982 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4485577686923757823, guid: 79298a366fb547947866d473c8312f84,
type: 3}
m_PrefabInstance: {fileID: 1102477311}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1254529986
MonoBehaviour:
m_ObjectHideFlags: 0