Skip to content

Commit 22ce0be

Browse files
committed
Merge branch 'Feature'
2 parents 14de4b4 + 42cf871 commit 22ce0be

19 files changed

+763
-276
lines changed

Assets/BrokenVector/LowPolyDungeon/Prefabs/Lamps/Candlestick_Triple.prefab

Lines changed: 23 additions & 218 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Transform:
3030
m_ConstrainProportionsScale: 0
3131
m_Children: []
3232
m_Father: {fileID: 8266949716707585787}
33-
m_RootOrder: 3
33+
m_RootOrder: 2
3434
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
3535
--- !u!122 &6745230406599112461
3636
Halo:
@@ -44,220 +44,6 @@ Halo:
4444
serializedVersion: 2
4545
rgba: 4278224383
4646
m_Size: -0.02
47-
--- !u!1 &2354486635074058067
48-
GameObject:
49-
m_ObjectHideFlags: 0
50-
m_CorrespondingSourceObject: {fileID: 0}
51-
m_PrefabInstance: {fileID: 0}
52-
m_PrefabAsset: {fileID: 0}
53-
serializedVersion: 6
54-
m_Component:
55-
- component: {fileID: 2166531139850364099}
56-
- component: {fileID: 1114773739493970588}
57-
- component: {fileID: 6736231434863590876}
58-
m_Layer: 10
59-
m_Name: CandleLight (1)
60-
m_TagString: Untagged
61-
m_Icon: {fileID: 0}
62-
m_NavMeshLayer: 0
63-
m_StaticEditorFlags: 2147483647
64-
m_IsActive: 1
65-
--- !u!4 &2166531139850364099
66-
Transform:
67-
m_ObjectHideFlags: 0
68-
m_CorrespondingSourceObject: {fileID: 0}
69-
m_PrefabInstance: {fileID: 0}
70-
m_PrefabAsset: {fileID: 0}
71-
m_GameObject: {fileID: 2354486635074058067}
72-
m_LocalRotation: {x: -0, y: -0.70710576, z: -0, w: 0.70710784}
73-
m_LocalPosition: {x: -0.25895008, y: 0.5809, z: -0.0009495093}
74-
m_LocalScale: {x: 1, y: 1, z: 1}
75-
m_ConstrainProportionsScale: 0
76-
m_Children: []
77-
m_Father: {fileID: 8266949716707585787}
78-
m_RootOrder: 2
79-
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
80-
--- !u!108 &1114773739493970588
81-
Light:
82-
m_ObjectHideFlags: 0
83-
m_CorrespondingSourceObject: {fileID: 0}
84-
m_PrefabInstance: {fileID: 0}
85-
m_PrefabAsset: {fileID: 0}
86-
m_GameObject: {fileID: 2354486635074058067}
87-
m_Enabled: 1
88-
serializedVersion: 10
89-
m_Type: 2
90-
m_Shape: 0
91-
m_Color: {r: 0.9529412, g: 0.81960785, b: 0.45490196, a: 1}
92-
m_Intensity: 1.5
93-
m_Range: 5
94-
m_SpotAngle: 30
95-
m_InnerSpotAngle: 21.80208
96-
m_CookieSize: 10
97-
m_Shadows:
98-
m_Type: 2
99-
m_Resolution: -1
100-
m_CustomResolution: -1
101-
m_Strength: 1
102-
m_Bias: 0.02
103-
m_NormalBias: 0.4
104-
m_NearPlane: 0.0945
105-
m_CullingMatrixOverride:
106-
e00: 1
107-
e01: 0
108-
e02: 0
109-
e03: 0
110-
e10: 0
111-
e11: 1
112-
e12: 0
113-
e13: 0
114-
e20: 0
115-
e21: 0
116-
e22: 1
117-
e23: 0
118-
e30: 0
119-
e31: 0
120-
e32: 0
121-
e33: 1
122-
m_UseCullingMatrixOverride: 0
123-
m_Cookie: {fileID: 0}
124-
m_DrawHalo: 0
125-
m_Flare: {fileID: 0}
126-
m_RenderMode: 0
127-
m_CullingMask:
128-
serializedVersion: 2
129-
m_Bits: 4294967295
130-
m_RenderingLayerMask: 1
131-
m_Lightmapping: 4
132-
m_LightShadowCasterMode: 0
133-
m_AreaSize: {x: 1, y: 1}
134-
m_BounceIntensity: 1.5
135-
m_ColorTemperature: 6570
136-
m_UseColorTemperature: 0
137-
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
138-
m_UseBoundingSphereOverride: 0
139-
m_UseViewFrustumForShadowCasterCull: 1
140-
m_ShadowRadius: 0
141-
m_ShadowAngle: 0
142-
--- !u!122 &6736231434863590876
143-
Halo:
144-
m_ObjectHideFlags: 0
145-
m_CorrespondingSourceObject: {fileID: 0}
146-
m_PrefabInstance: {fileID: 0}
147-
m_PrefabAsset: {fileID: 0}
148-
m_GameObject: {fileID: 2354486635074058067}
149-
m_Enabled: 1
150-
m_Color:
151-
serializedVersion: 2
152-
rgba: 4288406783
153-
m_Size: -0.05
154-
--- !u!1 &6316775257304867669
155-
GameObject:
156-
m_ObjectHideFlags: 0
157-
m_CorrespondingSourceObject: {fileID: 0}
158-
m_PrefabInstance: {fileID: 0}
159-
m_PrefabAsset: {fileID: 0}
160-
serializedVersion: 6
161-
m_Component:
162-
- component: {fileID: 954436160299161171}
163-
- component: {fileID: 2149857149831209931}
164-
- component: {fileID: 1077952424514272839}
165-
m_Layer: 10
166-
m_Name: CandleLight (2)
167-
m_TagString: Untagged
168-
m_Icon: {fileID: 0}
169-
m_NavMeshLayer: 0
170-
m_StaticEditorFlags: 2147483647
171-
m_IsActive: 1
172-
--- !u!4 &954436160299161171
173-
Transform:
174-
m_ObjectHideFlags: 0
175-
m_CorrespondingSourceObject: {fileID: 0}
176-
m_PrefabInstance: {fileID: 0}
177-
m_PrefabAsset: {fileID: 0}
178-
m_GameObject: {fileID: 6316775257304867669}
179-
m_LocalRotation: {x: -0, y: -0.70710576, z: -0, w: 0.70710784}
180-
m_LocalPosition: {x: 0.2589499, y: 0.5809, z: -0.0009506683}
181-
m_LocalScale: {x: 1, y: 1, z: 1}
182-
m_ConstrainProportionsScale: 0
183-
m_Children: []
184-
m_Father: {fileID: 8266949716707585787}
185-
m_RootOrder: 4
186-
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
187-
--- !u!108 &2149857149831209931
188-
Light:
189-
m_ObjectHideFlags: 0
190-
m_CorrespondingSourceObject: {fileID: 0}
191-
m_PrefabInstance: {fileID: 0}
192-
m_PrefabAsset: {fileID: 0}
193-
m_GameObject: {fileID: 6316775257304867669}
194-
m_Enabled: 1
195-
serializedVersion: 10
196-
m_Type: 2
197-
m_Shape: 0
198-
m_Color: {r: 0.9529412, g: 0.81960785, b: 0.45490196, a: 1}
199-
m_Intensity: 1.5
200-
m_Range: 5
201-
m_SpotAngle: 30
202-
m_InnerSpotAngle: 21.80208
203-
m_CookieSize: 10
204-
m_Shadows:
205-
m_Type: 2
206-
m_Resolution: -1
207-
m_CustomResolution: -1
208-
m_Strength: 1
209-
m_Bias: 0.02
210-
m_NormalBias: 0.4
211-
m_NearPlane: 0.0945
212-
m_CullingMatrixOverride:
213-
e00: 1
214-
e01: 0
215-
e02: 0
216-
e03: 0
217-
e10: 0
218-
e11: 1
219-
e12: 0
220-
e13: 0
221-
e20: 0
222-
e21: 0
223-
e22: 1
224-
e23: 0
225-
e30: 0
226-
e31: 0
227-
e32: 0
228-
e33: 1
229-
m_UseCullingMatrixOverride: 0
230-
m_Cookie: {fileID: 0}
231-
m_DrawHalo: 0
232-
m_Flare: {fileID: 0}
233-
m_RenderMode: 0
234-
m_CullingMask:
235-
serializedVersion: 2
236-
m_Bits: 4294967295
237-
m_RenderingLayerMask: 1
238-
m_Lightmapping: 4
239-
m_LightShadowCasterMode: 0
240-
m_AreaSize: {x: 1, y: 1}
241-
m_BounceIntensity: 1.5
242-
m_ColorTemperature: 6570
243-
m_UseColorTemperature: 0
244-
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
245-
m_UseBoundingSphereOverride: 0
246-
m_UseViewFrustumForShadowCasterCull: 1
247-
m_ShadowRadius: 0
248-
m_ShadowAngle: 0
249-
--- !u!122 &1077952424514272839
250-
Halo:
251-
m_ObjectHideFlags: 0
252-
m_CorrespondingSourceObject: {fileID: 0}
253-
m_PrefabInstance: {fileID: 0}
254-
m_PrefabAsset: {fileID: 0}
255-
m_GameObject: {fileID: 6316775257304867669}
256-
m_Enabled: 1
257-
m_Color:
258-
serializedVersion: 2
259-
rgba: 4288406783
260-
m_Size: -0.05
26147
--- !u!1 &6361864610118385978
26248
GameObject:
26349
m_ObjectHideFlags: 0
@@ -332,7 +118,7 @@ Transform:
332118
m_ConstrainProportionsScale: 0
333119
m_Children: []
334120
m_Father: {fileID: 8266949716707585787}
335-
m_RootOrder: 5
121+
m_RootOrder: 3
336122
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
337123
--- !u!122 &8431111312392669174
338124
Halo:
@@ -357,6 +143,7 @@ GameObject:
357143
- component: {fileID: 6480932485002912001}
358144
- component: {fileID: 2992976193325264541}
359145
- component: {fileID: 6222370200006673433}
146+
- component: {fileID: 8472980467116671377}
360147
m_Layer: 10
361148
m_Name: CandleLight
362149
m_TagString: Untagged
@@ -453,6 +240,26 @@ Halo:
453240
serializedVersion: 2
454241
rgba: 4288406783
455242
m_Size: -0.05
243+
--- !u!114 &8472980467116671377
244+
MonoBehaviour:
245+
m_ObjectHideFlags: 0
246+
m_CorrespondingSourceObject: {fileID: 0}
247+
m_PrefabInstance: {fileID: 0}
248+
m_PrefabAsset: {fileID: 0}
249+
m_GameObject: {fileID: 7387968435084664567}
250+
m_Enabled: 1
251+
m_EditorHideFlags: 0
252+
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
253+
m_Name:
254+
m_EditorClassIdentifier:
255+
m_Version: 1
256+
m_UsePipelineSettings: 1
257+
m_AdditionalLightsShadowResolutionTier: 2
258+
m_LightLayerMask: 1
259+
m_CustomShadowLayers: 0
260+
m_ShadowLayerMask: 1
261+
m_LightCookieSize: {x: 1, y: 1}
262+
m_LightCookieOffset: {x: 0, y: 0}
456263
--- !u!1 &8266949716707160795
457264
GameObject:
458265
m_ObjectHideFlags: 0
@@ -486,9 +293,7 @@ Transform:
486293
m_Children:
487294
- {fileID: 6480932485002912001}
488295
- {fileID: 542651301280776606}
489-
- {fileID: 2166531139850364099}
490296
- {fileID: 324716160553345329}
491-
- {fileID: 954436160299161171}
492297
- {fileID: 1827689081639847779}
493298
m_Father: {fileID: 0}
494299
m_RootOrder: 0

Assets/GraphCaches.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/GraphCaches/GraphCache.bytes

-7 Bytes
Binary file not shown.

Assets/GraphCaches/GraphCache.bytes.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Materials/Enemies/Simple Green.mat

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Material:
2222
serializedVersion: 3
2323
m_TexEnvs:
2424
- _BaseMap:
25-
m_Texture: {fileID: 0}
26-
m_Scale: {x: 1, y: 1}
25+
m_Texture: {fileID: 2800000, guid: 6b3f574ac50d14847b29d77fee41b5db, type: 3}
26+
m_Scale: {x: 20, y: 20}
2727
m_Offset: {x: 0, y: 0}
2828
- _BumpMap:
2929
m_Texture: {fileID: 0}
@@ -46,8 +46,8 @@ Material:
4646
m_Scale: {x: 1, y: 1}
4747
m_Offset: {x: 0, y: 0}
4848
- _MainTex:
49-
m_Texture: {fileID: 0}
50-
m_Scale: {x: 1, y: 1}
49+
m_Texture: {fileID: 2800000, guid: 6b3f574ac50d14847b29d77fee41b5db, type: 3}
50+
m_Scale: {x: 20, y: 20}
5151
m_Offset: {x: 0, y: 0}
5252
- _MetallicGlossMap:
5353
m_Texture: {fileID: 0}
@@ -90,26 +90,24 @@ Material:
9090
- _DetailNormalMapScale: 1
9191
- _DstBlend: 0
9292
- _EnvironmentReflections: 1
93-
- _GlossMapScale: 1
94-
- _Glossiness: 0.5
95-
- _GlossyReflections: 1
93+
- _GlossMapScale: 0
94+
- _Glossiness: 0
95+
- _GlossyReflections: 0
9696
- _Metallic: 0
97-
- _Mode: 0
9897
- _OcclusionStrength: 1
99-
- _Parallax: 0.02
98+
- _Parallax: 0.005
10099
- _QueueOffset: 0
101100
- _ReceiveShadows: 1
102-
- _Smoothness: 0.5
101+
- _Smoothness: 0.278
103102
- _SmoothnessTextureChannel: 0
104103
- _SpecularHighlights: 1
105104
- _SrcBlend: 1
106105
- _Surface: 0
107-
- _UVSec: 0
108106
- _WorkflowMode: 1
109107
- _ZWrite: 1
110108
m_Colors:
111-
- _BaseColor: {r: 0.05724919, g: 1, b: 0, a: 1}
112-
- _Color: {r: 0.05724919, g: 1, b: 0, a: 1}
109+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
110+
- _Color: {r: 1, g: 1, b: 1, a: 1}
113111
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
114112
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
115113
m_BuildTextureStacks: []

0 commit comments

Comments
 (0)