Skip to content

Commit f5b655a

Browse files
committed
Merge branch 'develop' of https://github.com/KMUGameProgramming/HideNSeek into develop
2 parents 7db3133 + 92ccf50 commit f5b655a

File tree

973 files changed

+156308
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

973 files changed

+156308
-20
lines changed

Client/Assets/Resources/Prefabs/Structures.meta

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

Client/Assets/Resources/Prefabs/Structures/Fragments.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &101144
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 100100000}
8+
serializedVersion: 6
9+
m_Component:
10+
- component: {fileID: 453906}
11+
- component: {fileID: 3357128}
12+
- component: {fileID: 2327398}
13+
- component: {fileID: 6507788}
14+
m_Layer: 0
15+
m_Name: blank_wall_C
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &453906
22+
Transform:
23+
m_ObjectHideFlags: 1
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInternal: {fileID: 100100000}
26+
m_GameObject: {fileID: 101144}
27+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28+
m_LocalPosition: {x: 0, y: 0, z: 0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_Children: []
31+
m_Father: {fileID: 0}
32+
m_RootOrder: 0
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
--- !u!23 &2327398
35+
MeshRenderer:
36+
m_ObjectHideFlags: 1
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInternal: {fileID: 100100000}
39+
m_GameObject: {fileID: 101144}
40+
m_Enabled: 1
41+
m_CastShadows: 1
42+
m_ReceiveShadows: 1
43+
m_DynamicOccludee: 1
44+
m_MotionVectors: 1
45+
m_LightProbeUsage: 1
46+
m_ReflectionProbeUsage: 1
47+
m_RenderingLayerMask: 4294967295
48+
m_Materials:
49+
- {fileID: 2100000, guid: 10de6384af0c3b54e8166f9c3f936e88, type: 2}
50+
m_StaticBatchInfo:
51+
firstSubMesh: 0
52+
subMeshCount: 0
53+
m_StaticBatchRoot: {fileID: 0}
54+
m_ProbeAnchor: {fileID: 0}
55+
m_LightProbeVolumeOverride: {fileID: 0}
56+
m_ScaleInLightmap: 1
57+
m_PreserveUVs: 0
58+
m_IgnoreNormalsForChartDetection: 0
59+
m_ImportantGI: 0
60+
m_StitchLightmapSeams: 0
61+
m_SelectedEditorRenderState: 3
62+
m_MinimumChartSize: 4
63+
m_AutoUVMaxDistance: 0.5
64+
m_AutoUVMaxAngle: 89
65+
m_LightmapParameters: {fileID: 0}
66+
m_SortingLayerID: 0
67+
m_SortingLayer: 0
68+
m_SortingOrder: 0
69+
--- !u!33 &3357128
70+
MeshFilter:
71+
m_ObjectHideFlags: 1
72+
m_CorrespondingSourceObject: {fileID: 0}
73+
m_PrefabInternal: {fileID: 100100000}
74+
m_GameObject: {fileID: 101144}
75+
m_Mesh: {fileID: 4300000, guid: 1f977334a78ed00469d9a6558eecaa3f, type: 3}
76+
--- !u!65 &6507788
77+
BoxCollider:
78+
m_ObjectHideFlags: 1
79+
m_CorrespondingSourceObject: {fileID: 0}
80+
m_PrefabInternal: {fileID: 100100000}
81+
m_GameObject: {fileID: 101144}
82+
m_Material: {fileID: 0}
83+
m_IsTrigger: 0
84+
m_Enabled: 1
85+
serializedVersion: 2
86+
m_Size: {x: 4, y: 4, z: 0.20000003}
87+
m_Center: {x: 0, y: 2, z: 0}
88+
--- !u!1001 &100100000
89+
Prefab:
90+
m_ObjectHideFlags: 1
91+
serializedVersion: 2
92+
m_Modification:
93+
m_TransformParent: {fileID: 0}
94+
m_Modifications: []
95+
m_RemovedComponents: []
96+
m_SourcePrefab: {fileID: 0}
97+
m_RootGameObject: {fileID: 101144}
98+
m_IsPrefabAsset: 1

Client/Assets/Resources/Prefabs/Structures/Fragments/blank_wall_C.prefab.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &106398
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 100100000}
8+
serializedVersion: 6
9+
m_Component:
10+
- component: {fileID: 438710}
11+
- component: {fileID: 3375304}
12+
- component: {fileID: 2347504}
13+
m_Layer: 0
14+
m_Name: decorative_wall_1_LOD0
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!1 &115926
21+
GameObject:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInternal: {fileID: 100100000}
25+
serializedVersion: 6
26+
m_Component:
27+
- component: {fileID: 416422}
28+
- component: {fileID: 3348850}
29+
- component: {fileID: 2376344}
30+
m_Layer: 0
31+
m_Name: decorative_wall_1_LOD1
32+
m_TagString: Untagged
33+
m_Icon: {fileID: 0}
34+
m_NavMeshLayer: 0
35+
m_StaticEditorFlags: 0
36+
m_IsActive: 1
37+
--- !u!1 &122448
38+
GameObject:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInternal: {fileID: 100100000}
42+
serializedVersion: 6
43+
m_Component:
44+
- component: {fileID: 499240}
45+
- component: {fileID: 6574006}
46+
- component: {fileID: 20535900}
47+
m_Layer: 0
48+
m_Name: decorative_wall_1
49+
m_TagString: Untagged
50+
m_Icon: {fileID: 0}
51+
m_NavMeshLayer: 0
52+
m_StaticEditorFlags: 0
53+
m_IsActive: 1
54+
--- !u!4 &416422
55+
Transform:
56+
m_ObjectHideFlags: 1
57+
m_CorrespondingSourceObject: {fileID: 0}
58+
m_PrefabInternal: {fileID: 100100000}
59+
m_GameObject: {fileID: 115926}
60+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
61+
m_LocalPosition: {x: 0, y: 0, z: 0}
62+
m_LocalScale: {x: 1, y: 1, z: 1}
63+
m_Children: []
64+
m_Father: {fileID: 499240}
65+
m_RootOrder: 1
66+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
67+
--- !u!4 &438710
68+
Transform:
69+
m_ObjectHideFlags: 1
70+
m_CorrespondingSourceObject: {fileID: 0}
71+
m_PrefabInternal: {fileID: 100100000}
72+
m_GameObject: {fileID: 106398}
73+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
74+
m_LocalPosition: {x: 0, y: 0, z: 0}
75+
m_LocalScale: {x: 1, y: 1, z: 1}
76+
m_Children: []
77+
m_Father: {fileID: 499240}
78+
m_RootOrder: 0
79+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
80+
--- !u!4 &499240
81+
Transform:
82+
m_ObjectHideFlags: 1
83+
m_CorrespondingSourceObject: {fileID: 0}
84+
m_PrefabInternal: {fileID: 100100000}
85+
m_GameObject: {fileID: 122448}
86+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
87+
m_LocalPosition: {x: 0, y: 0, z: 0}
88+
m_LocalScale: {x: 1, y: 1, z: 1}
89+
m_Children:
90+
- {fileID: 438710}
91+
- {fileID: 416422}
92+
m_Father: {fileID: 0}
93+
m_RootOrder: 0
94+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
95+
--- !u!23 &2347504
96+
MeshRenderer:
97+
m_ObjectHideFlags: 1
98+
m_CorrespondingSourceObject: {fileID: 0}
99+
m_PrefabInternal: {fileID: 100100000}
100+
m_GameObject: {fileID: 106398}
101+
m_Enabled: 1
102+
m_CastShadows: 1
103+
m_ReceiveShadows: 1
104+
m_DynamicOccludee: 1
105+
m_MotionVectors: 1
106+
m_LightProbeUsage: 1
107+
m_ReflectionProbeUsage: 1
108+
m_RenderingLayerMask: 4294967295
109+
m_Materials:
110+
- {fileID: 2100000, guid: 10de6384af0c3b54e8166f9c3f936e88, type: 2}
111+
m_StaticBatchInfo:
112+
firstSubMesh: 0
113+
subMeshCount: 0
114+
m_StaticBatchRoot: {fileID: 0}
115+
m_ProbeAnchor: {fileID: 0}
116+
m_LightProbeVolumeOverride: {fileID: 0}
117+
m_ScaleInLightmap: 1
118+
m_PreserveUVs: 0
119+
m_IgnoreNormalsForChartDetection: 0
120+
m_ImportantGI: 0
121+
m_StitchLightmapSeams: 0
122+
m_SelectedEditorRenderState: 3
123+
m_MinimumChartSize: 4
124+
m_AutoUVMaxDistance: 0.5
125+
m_AutoUVMaxAngle: 89
126+
m_LightmapParameters: {fileID: 0}
127+
m_SortingLayerID: 0
128+
m_SortingLayer: 0
129+
m_SortingOrder: 0
130+
--- !u!23 &2376344
131+
MeshRenderer:
132+
m_ObjectHideFlags: 1
133+
m_CorrespondingSourceObject: {fileID: 0}
134+
m_PrefabInternal: {fileID: 100100000}
135+
m_GameObject: {fileID: 115926}
136+
m_Enabled: 1
137+
m_CastShadows: 1
138+
m_ReceiveShadows: 1
139+
m_DynamicOccludee: 1
140+
m_MotionVectors: 1
141+
m_LightProbeUsage: 1
142+
m_ReflectionProbeUsage: 1
143+
m_RenderingLayerMask: 4294967295
144+
m_Materials:
145+
- {fileID: 2100000, guid: 10de6384af0c3b54e8166f9c3f936e88, type: 2}
146+
m_StaticBatchInfo:
147+
firstSubMesh: 0
148+
subMeshCount: 0
149+
m_StaticBatchRoot: {fileID: 0}
150+
m_ProbeAnchor: {fileID: 0}
151+
m_LightProbeVolumeOverride: {fileID: 0}
152+
m_ScaleInLightmap: 1
153+
m_PreserveUVs: 0
154+
m_IgnoreNormalsForChartDetection: 0
155+
m_ImportantGI: 0
156+
m_StitchLightmapSeams: 0
157+
m_SelectedEditorRenderState: 3
158+
m_MinimumChartSize: 4
159+
m_AutoUVMaxDistance: 0.5
160+
m_AutoUVMaxAngle: 89
161+
m_LightmapParameters: {fileID: 0}
162+
m_SortingLayerID: 0
163+
m_SortingLayer: 0
164+
m_SortingOrder: 0
165+
--- !u!33 &3348850
166+
MeshFilter:
167+
m_ObjectHideFlags: 1
168+
m_CorrespondingSourceObject: {fileID: 0}
169+
m_PrefabInternal: {fileID: 100100000}
170+
m_GameObject: {fileID: 115926}
171+
m_Mesh: {fileID: 4300000, guid: 0eb978c8eaeb00e4882ac2cf4e1ab020, type: 3}
172+
--- !u!33 &3375304
173+
MeshFilter:
174+
m_ObjectHideFlags: 1
175+
m_CorrespondingSourceObject: {fileID: 0}
176+
m_PrefabInternal: {fileID: 100100000}
177+
m_GameObject: {fileID: 106398}
178+
m_Mesh: {fileID: 4300000, guid: cfaae91c0468de14fa52db2da7d5746a, type: 3}
179+
--- !u!65 &6574006
180+
BoxCollider:
181+
m_ObjectHideFlags: 1
182+
m_CorrespondingSourceObject: {fileID: 0}
183+
m_PrefabInternal: {fileID: 100100000}
184+
m_GameObject: {fileID: 122448}
185+
m_Material: {fileID: 0}
186+
m_IsTrigger: 0
187+
m_Enabled: 1
188+
serializedVersion: 2
189+
m_Size: {x: 4, y: 4, z: 0.29866645}
190+
m_Center: {x: 0, y: 2, z: 0.14933307}
191+
--- !u!205 &20535900
192+
LODGroup:
193+
m_ObjectHideFlags: 1
194+
m_CorrespondingSourceObject: {fileID: 0}
195+
m_PrefabInternal: {fileID: 100100000}
196+
m_GameObject: {fileID: 122448}
197+
serializedVersion: 2
198+
m_LocalReferencePoint: {x: 0, y: 2, z: 0.14933307}
199+
m_Size: 4
200+
m_FadeMode: 0
201+
m_AnimateCrossFading: 1
202+
m_LODs:
203+
- screenRelativeHeight: 0.4119806
204+
fadeTransitionWidth: 0
205+
renderers:
206+
- renderer: {fileID: 2347504}
207+
- screenRelativeHeight: 0.037201747
208+
fadeTransitionWidth: 0
209+
renderers:
210+
- renderer: {fileID: 2376344}
211+
m_Enabled: 1
212+
--- !u!1001 &100100000
213+
Prefab:
214+
m_ObjectHideFlags: 1
215+
serializedVersion: 2
216+
m_Modification:
217+
m_TransformParent: {fileID: 0}
218+
m_Modifications: []
219+
m_RemovedComponents: []
220+
m_SourcePrefab: {fileID: 0}
221+
m_RootGameObject: {fileID: 122448}
222+
m_IsPrefabAsset: 1

Client/Assets/Resources/Prefabs/Structures/Fragments/decorative_wall_1.prefab.meta

Lines changed: 8 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)