Skip to content

Commit 2197d51

Browse files
committed
Merge branch 'master' of github.com:JohannesDeml/GGJ2020
2 parents 78b7b57 + cb57c58 commit 2197d51

File tree

14 files changed

+3807
-108
lines changed

14 files changed

+3807
-108
lines changed

Assets/_Project/00_Scenes/JD.unity

Lines changed: 396 additions & 98 deletions
Large diffs are not rendered by default.
Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &4828482337849404410
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 4828482337849404414}
12+
- component: {fileID: 4828482337849404413}
13+
- component: {fileID: 4828482337849404412}
14+
- component: {fileID: 4828482337849404411}
15+
m_Layer: 0
16+
m_Name: Floor
17+
m_TagString: Untagged
18+
m_Icon: {fileID: 0}
19+
m_NavMeshLayer: 0
20+
m_StaticEditorFlags: 0
21+
m_IsActive: 1
22+
--- !u!4 &4828482337849404414
23+
Transform:
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
28+
m_GameObject: {fileID: 4828482337849404410}
29+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
30+
m_LocalPosition: {x: 0, y: -1, z: 0}
31+
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_Children:
33+
- {fileID: 148867762129133485}
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!33 &4828482337849404413
38+
MeshFilter:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 4828482337849404410}
44+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
45+
--- !u!23 &4828482337849404412
46+
MeshRenderer:
47+
m_ObjectHideFlags: 0
48+
m_CorrespondingSourceObject: {fileID: 0}
49+
m_PrefabInstance: {fileID: 0}
50+
m_PrefabAsset: {fileID: 0}
51+
m_GameObject: {fileID: 4828482337849404410}
52+
m_Enabled: 0
53+
m_CastShadows: 1
54+
m_ReceiveShadows: 1
55+
m_DynamicOccludee: 1
56+
m_MotionVectors: 1
57+
m_LightProbeUsage: 1
58+
m_ReflectionProbeUsage: 1
59+
m_RayTracingMode: 2
60+
m_RenderingLayerMask: 1
61+
m_RendererPriority: 0
62+
m_Materials:
63+
- {fileID: 2100000, guid: b01d025ccd6e0884e8bed571160ed289, type: 2}
64+
m_StaticBatchInfo:
65+
firstSubMesh: 0
66+
subMeshCount: 0
67+
m_StaticBatchRoot: {fileID: 0}
68+
m_ProbeAnchor: {fileID: 0}
69+
m_LightProbeVolumeOverride: {fileID: 0}
70+
m_ScaleInLightmap: 1
71+
m_ReceiveGI: 1
72+
m_PreserveUVs: 0
73+
m_IgnoreNormalsForChartDetection: 0
74+
m_ImportantGI: 0
75+
m_StitchLightmapSeams: 1
76+
m_SelectedEditorRenderState: 3
77+
m_MinimumChartSize: 4
78+
m_AutoUVMaxDistance: 0.5
79+
m_AutoUVMaxAngle: 89
80+
m_LightmapParameters: {fileID: 0}
81+
m_SortingLayerID: 0
82+
m_SortingLayer: 0
83+
m_SortingOrder: 0
84+
--- !u!65 &4828482337849404411
85+
BoxCollider:
86+
m_ObjectHideFlags: 0
87+
m_CorrespondingSourceObject: {fileID: 0}
88+
m_PrefabInstance: {fileID: 0}
89+
m_PrefabAsset: {fileID: 0}
90+
m_GameObject: {fileID: 4828482337849404410}
91+
m_Material: {fileID: 0}
92+
m_IsTrigger: 0
93+
m_Enabled: 1
94+
serializedVersion: 2
95+
m_Size: {x: 10, y: 1, z: 10}
96+
m_Center: {x: 0, y: 0, z: 0}
97+
--- !u!1 &7138378324006646625
98+
GameObject:
99+
m_ObjectHideFlags: 0
100+
m_CorrespondingSourceObject: {fileID: 0}
101+
m_PrefabInstance: {fileID: 0}
102+
m_PrefabAsset: {fileID: 0}
103+
serializedVersion: 6
104+
m_Component:
105+
- component: {fileID: 148867762129133485}
106+
- component: {fileID: 516713761969299282}
107+
- component: {fileID: 5564803544649257706}
108+
- component: {fileID: 4698746617931091100}
109+
m_Layer: 0
110+
m_Name: Cube
111+
m_TagString: Untagged
112+
m_Icon: {fileID: 0}
113+
m_NavMeshLayer: 0
114+
m_StaticEditorFlags: 0
115+
m_IsActive: 1
116+
--- !u!4 &148867762129133485
117+
Transform:
118+
m_ObjectHideFlags: 0
119+
m_CorrespondingSourceObject: {fileID: 0}
120+
m_PrefabInstance: {fileID: 0}
121+
m_PrefabAsset: {fileID: 0}
122+
m_GameObject: {fileID: 7138378324006646625}
123+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
124+
m_LocalPosition: {x: 0, y: 0, z: 0}
125+
m_LocalScale: {x: 10, y: 1, z: 10}
126+
m_Children: []
127+
m_Father: {fileID: 4828482337849404414}
128+
m_RootOrder: 0
129+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
130+
--- !u!33 &516713761969299282
131+
MeshFilter:
132+
m_ObjectHideFlags: 0
133+
m_CorrespondingSourceObject: {fileID: 0}
134+
m_PrefabInstance: {fileID: 0}
135+
m_PrefabAsset: {fileID: 0}
136+
m_GameObject: {fileID: 7138378324006646625}
137+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
138+
--- !u!23 &5564803544649257706
139+
MeshRenderer:
140+
m_ObjectHideFlags: 0
141+
m_CorrespondingSourceObject: {fileID: 0}
142+
m_PrefabInstance: {fileID: 0}
143+
m_PrefabAsset: {fileID: 0}
144+
m_GameObject: {fileID: 7138378324006646625}
145+
m_Enabled: 1
146+
m_CastShadows: 1
147+
m_ReceiveShadows: 1
148+
m_DynamicOccludee: 1
149+
m_MotionVectors: 1
150+
m_LightProbeUsage: 1
151+
m_ReflectionProbeUsage: 1
152+
m_RayTracingMode: 2
153+
m_RenderingLayerMask: 1
154+
m_RendererPriority: 0
155+
m_Materials:
156+
- {fileID: 2100000, guid: b01d025ccd6e0884e8bed571160ed289, type: 2}
157+
m_StaticBatchInfo:
158+
firstSubMesh: 0
159+
subMeshCount: 0
160+
m_StaticBatchRoot: {fileID: 0}
161+
m_ProbeAnchor: {fileID: 0}
162+
m_LightProbeVolumeOverride: {fileID: 0}
163+
m_ScaleInLightmap: 1
164+
m_ReceiveGI: 1
165+
m_PreserveUVs: 0
166+
m_IgnoreNormalsForChartDetection: 0
167+
m_ImportantGI: 0
168+
m_StitchLightmapSeams: 1
169+
m_SelectedEditorRenderState: 3
170+
m_MinimumChartSize: 4
171+
m_AutoUVMaxDistance: 0.5
172+
m_AutoUVMaxAngle: 89
173+
m_LightmapParameters: {fileID: 0}
174+
m_SortingLayerID: 0
175+
m_SortingLayer: 0
176+
m_SortingOrder: 0
177+
--- !u!65 &4698746617931091100
178+
BoxCollider:
179+
m_ObjectHideFlags: 0
180+
m_CorrespondingSourceObject: {fileID: 0}
181+
m_PrefabInstance: {fileID: 0}
182+
m_PrefabAsset: {fileID: 0}
183+
m_GameObject: {fileID: 7138378324006646625}
184+
m_Material: {fileID: 0}
185+
m_IsTrigger: 0
186+
m_Enabled: 1
187+
serializedVersion: 2
188+
m_Size: {x: 1, y: 1, z: 1}
189+
m_Center: {x: 0, y: 0, z: 0}

Assets/_Project/01_Prefabs/Floor.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)