Skip to content

Commit aa274e0

Browse files
Bernhard ReinsprechtBernhard Reinsprecht
Bernhard Reinsprecht
authored and
Bernhard Reinsprecht
committed
added pp, and correct firing
1 parent db185be commit aa274e0

12 files changed

+622
-97
lines changed

Assets/Materials/LaserMaterial.mat

+13-12
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: LaserMaterial
11-
m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords: _ALPHABLEND_ON _EMISSION
13+
m_LightmapFlags: 1
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: -1
17-
stringTagMap: {}
16+
m_CustomRenderQueue: 3000
17+
stringTagMap:
18+
RenderType: Transparent
1819
disabledShaderPasses: []
1920
m_SavedProperties:
2021
serializedVersion: 3
@@ -36,7 +37,7 @@ Material:
3637
m_Scale: {x: 1, y: 1}
3738
m_Offset: {x: 0, y: 0}
3839
- _EmissionMap:
39-
m_Texture: {fileID: 0}
40+
m_Texture: {fileID: 2800000, guid: c51509ed335a66841a194c97edfed0db, type: 3}
4041
m_Scale: {x: 1, y: 1}
4142
m_Offset: {x: 0, y: 0}
4243
- _MainTex:
@@ -60,25 +61,25 @@ Material:
6061
- _ColorMask: 15
6162
- _Cutoff: 0.5
6263
- _DetailNormalMapScale: 1
63-
- _DstBlend: 0
64+
- _DstBlend: 10
6465
- _GlossMapScale: 1
6566
- _Glossiness: 0.5
6667
- _GlossyReflections: 1
6768
- _Metallic: 0
68-
- _Mode: 0
69+
- _Mode: 2
6970
- _OcclusionStrength: 1
7071
- _Parallax: 0.02
7172
- _SmoothnessTextureChannel: 0
7273
- _SpecularHighlights: 1
73-
- _SrcBlend: 1
74+
- _SrcBlend: 5
7475
- _Stencil: 0
7576
- _StencilComp: 8
7677
- _StencilOp: 0
7778
- _StencilReadMask: 255
7879
- _StencilWriteMask: 255
7980
- _UVSec: 0
8081
- _UseUIAlphaClip: 0
81-
- _ZWrite: 1
82+
- _ZWrite: 0
8283
m_Colors:
83-
- _Color: {r: 1, g: 0, b: 0, a: 1}
84-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
84+
- _Color: {r: 0, g: 0, b: 0, a: 1}
85+
- _EmissionColor: {r: 23.968628, g: 4.351869, b: 1.1294111, a: 1}

Assets/Prefabs/tank.prefab

+132-37
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &999069398304416198
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: 172683891490136266}
12+
m_Layer: 0
13+
m_Name: GunContainer
14+
m_TagString: Untagged
15+
m_Icon: {fileID: 0}
16+
m_NavMeshLayer: 0
17+
m_StaticEditorFlags: 0
18+
m_IsActive: 1
19+
--- !u!4 &172683891490136266
20+
Transform:
21+
m_ObjectHideFlags: 0
22+
m_CorrespondingSourceObject: {fileID: 0}
23+
m_PrefabInstance: {fileID: 0}
24+
m_PrefabAsset: {fileID: 0}
25+
m_GameObject: {fileID: 999069398304416198}
26+
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
27+
m_LocalPosition: {x: 0, y: 0, z: 0}
28+
m_LocalScale: {x: 1, y: 1, z: 1}
29+
m_Children:
30+
- {fileID: 760736770901263335}
31+
m_Father: {fileID: 5249860388373993279}
32+
m_RootOrder: 1
33+
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
334
--- !u!1 &4400843766326914147
435
GameObject:
536
m_ObjectHideFlags: 0
@@ -90,7 +121,6 @@ GameObject:
90121
- component: {fileID: 5249860388373993279}
91122
- component: {fileID: 703449132101173216}
92123
- component: {fileID: 6249561838297519027}
93-
- component: {fileID: 1600303588341203088}
94124
m_Layer: 0
95125
m_Name: Turret
96126
m_TagString: Untagged
@@ -105,14 +135,14 @@ Transform:
105135
m_PrefabInstance: {fileID: 0}
106136
m_PrefabAsset: {fileID: 0}
107137
m_GameObject: {fileID: 4856187244276898645}
108-
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
109-
m_LocalPosition: {x: 0.02611956, y: 0.59933, z: 4.656613e-10}
110-
m_LocalScale: {x: -68.79074, y: -25.439945, z: -15.915147}
138+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
139+
m_LocalPosition: {x: 0, y: 0, z: 0}
140+
m_LocalScale: {x: -68.79074, y: -25.439938, z: -15.915143}
111141
m_Children:
112142
- {fileID: 7402199036625631446}
113-
- {fileID: 760736770901263335}
114-
m_Father: {fileID: 8738579441482853781}
115-
m_RootOrder: 1
143+
- {fileID: 172683891490136266}
144+
m_Father: {fileID: 6674256375794912883}
145+
m_RootOrder: 0
116146
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
117147
--- !u!33 &703449132101173216
118148
MeshFilter:
@@ -160,29 +190,6 @@ MeshRenderer:
160190
m_SortingLayerID: 0
161191
m_SortingLayer: 0
162192
m_SortingOrder: 0
163-
--- !u!114 &1600303588341203088
164-
MonoBehaviour:
165-
m_ObjectHideFlags: 0
166-
m_CorrespondingSourceObject: {fileID: 0}
167-
m_PrefabInstance: {fileID: 0}
168-
m_PrefabAsset: {fileID: 0}
169-
m_GameObject: {fileID: 4856187244276898645}
170-
m_Enabled: 1
171-
m_EditorHideFlags: 0
172-
m_Script: {fileID: 11500000, guid: 12f137aaff87c47469b4514c62c7b2b8, type: 3}
173-
m_Name:
174-
m_EditorClassIdentifier:
175-
target: {fileID: 0}
176-
rotationSpeed: 50
177-
barrel: {fileID: 760736770901263335}
178-
viewDistance: 50
179-
enemyLayerMask:
180-
serializedVersion: 2
181-
m_Bits: 0
182-
rateOfFire: 20
183-
projectilePrefab: {fileID: 7140508325201832443, guid: e9c85744a613ac245ad041f315e6b769,
184-
type: 3}
185-
center: {fileID: 5249860388373993279}
186193
--- !u!1 &5701260720017710982
187194
GameObject:
188195
m_ObjectHideFlags: 0
@@ -212,7 +219,7 @@ Transform:
212219
m_LocalScale: {x: 1, y: 1, z: 1}
213220
m_Children:
214221
- {fileID: 622751670700004772}
215-
- {fileID: 5249860388373993279}
222+
- {fileID: 6674256375794912883}
216223
m_Father: {fileID: 0}
217224
m_RootOrder: 0
218225
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -229,6 +236,93 @@ BoxCollider:
229236
serializedVersion: 2
230237
m_Size: {x: 3, y: 1, z: 2}
231238
m_Center: {x: 0, y: 0.2, z: 0}
239+
--- !u!1 &6309289302879773285
240+
GameObject:
241+
m_ObjectHideFlags: 0
242+
m_CorrespondingSourceObject: {fileID: 0}
243+
m_PrefabInstance: {fileID: 0}
244+
m_PrefabAsset: {fileID: 0}
245+
serializedVersion: 6
246+
m_Component:
247+
- component: {fileID: 2152098072501318035}
248+
m_Layer: 0
249+
m_Name: Opening
250+
m_TagString: Untagged
251+
m_Icon: {fileID: 0}
252+
m_NavMeshLayer: 0
253+
m_StaticEditorFlags: 0
254+
m_IsActive: 1
255+
--- !u!4 &2152098072501318035
256+
Transform:
257+
m_ObjectHideFlags: 0
258+
m_CorrespondingSourceObject: {fileID: 0}
259+
m_PrefabInstance: {fileID: 0}
260+
m_PrefabAsset: {fileID: 0}
261+
m_GameObject: {fileID: 6309289302879773285}
262+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
263+
m_LocalPosition: {x: 0, y: 0, z: -0.1469}
264+
m_LocalScale: {x: 1, y: 1, z: 1}
265+
m_Children: []
266+
m_Father: {fileID: 760736770901263335}
267+
m_RootOrder: 0
268+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
269+
--- !u!1 &7203340187833875360
270+
GameObject:
271+
m_ObjectHideFlags: 0
272+
m_CorrespondingSourceObject: {fileID: 0}
273+
m_PrefabInstance: {fileID: 0}
274+
m_PrefabAsset: {fileID: 0}
275+
serializedVersion: 6
276+
m_Component:
277+
- component: {fileID: 6674256375794912883}
278+
- component: {fileID: 2783635993630702734}
279+
m_Layer: 0
280+
m_Name: TurretContainer
281+
m_TagString: Untagged
282+
m_Icon: {fileID: 0}
283+
m_NavMeshLayer: 0
284+
m_StaticEditorFlags: 0
285+
m_IsActive: 1
286+
--- !u!4 &6674256375794912883
287+
Transform:
288+
m_ObjectHideFlags: 0
289+
m_CorrespondingSourceObject: {fileID: 0}
290+
m_PrefabInstance: {fileID: 0}
291+
m_PrefabAsset: {fileID: 0}
292+
m_GameObject: {fileID: 7203340187833875360}
293+
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
294+
m_LocalPosition: {x: 0, y: 0.6, z: 0}
295+
m_LocalScale: {x: 1, y: 1, z: 1}
296+
m_Children:
297+
- {fileID: 5249860388373993279}
298+
m_Father: {fileID: 8738579441482853781}
299+
m_RootOrder: 1
300+
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
301+
--- !u!114 &2783635993630702734
302+
MonoBehaviour:
303+
m_ObjectHideFlags: 0
304+
m_CorrespondingSourceObject: {fileID: 0}
305+
m_PrefabInstance: {fileID: 0}
306+
m_PrefabAsset: {fileID: 0}
307+
m_GameObject: {fileID: 7203340187833875360}
308+
m_Enabled: 1
309+
m_EditorHideFlags: 0
310+
m_Script: {fileID: 11500000, guid: 12f137aaff87c47469b4514c62c7b2b8, type: 3}
311+
m_Name:
312+
m_EditorClassIdentifier:
313+
target: {fileID: 0}
314+
rotationSpeed: 50
315+
barrel: {fileID: 172683891490136266}
316+
barrelOpenings:
317+
- {fileID: 2152098072501318035}
318+
viewDistance: 50
319+
enemyLayerMask:
320+
serializedVersion: 2
321+
m_Bits: 1024
322+
rateOfFire: 20
323+
projectilePrefab: {fileID: 7140508325201832443, guid: e9c85744a613ac245ad041f315e6b769,
324+
type: 3}
325+
center: {fileID: 5249860388373993279}
232326
--- !u!1 &8528123088340062223
233327
GameObject:
234328
m_ObjectHideFlags: 0
@@ -254,12 +348,13 @@ Transform:
254348
m_PrefabInstance: {fileID: 0}
255349
m_PrefabAsset: {fileID: 0}
256350
m_GameObject: {fileID: 8528123088340062223}
257-
m_LocalRotation: {x: -0, y: -0.7071067, z: 0, w: 0.7071068}
258-
m_LocalPosition: {x: -0.008315047, y: 9.152171e-12, z: 0.010215478}
259-
m_LocalScale: {x: -0.578259, y: -0.36175698, z: -0.13378368}
260-
m_Children: []
261-
m_Father: {fileID: 5249860388373993279}
262-
m_RootOrder: 1
351+
m_LocalRotation: {x: 0.50000006, y: -0.49999994, z: -0.49999994, w: 0.50000006}
352+
m_LocalPosition: {x: -0.008315047, y: -0.01021548, z: 0}
353+
m_LocalScale: {x: -0.57825917, y: -0.3617571, z: -0.13378367}
354+
m_Children:
355+
- {fileID: 2152098072501318035}
356+
m_Father: {fileID: 172683891490136266}
357+
m_RootOrder: 0
263358
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
264359
--- !u!33 &8440796769494885761
265360
MeshFilter:

Assets/Prefabs/turret.prefab

+33
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ Transform:
7676
m_LocalScale: {x: -1.7695767, y: -1.6138072, z: -0.36363703}
7777
m_Children:
7878
- {fileID: 7583842111843031956}
79+
- {fileID: 2503255335527640216}
7980
m_Father: {fileID: 1789865246113132118}
8081
m_RootOrder: 0
8182
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -223,6 +224,8 @@ MonoBehaviour:
223224
target: {fileID: 0}
224225
rotationSpeed: 30
225226
barrel: {fileID: 4091439487445261377}
227+
barrelOpenings:
228+
- {fileID: 2503255335527640216}
226229
viewDistance: 20
227230
enemyLayerMask:
228231
serializedVersion: 2
@@ -530,3 +533,33 @@ MeshRenderer:
530533
m_SortingLayerID: 0
531534
m_SortingLayer: 0
532535
m_SortingOrder: 0
536+
--- !u!1 &8056186602030909206
537+
GameObject:
538+
m_ObjectHideFlags: 0
539+
m_CorrespondingSourceObject: {fileID: 0}
540+
m_PrefabInstance: {fileID: 0}
541+
m_PrefabAsset: {fileID: 0}
542+
serializedVersion: 6
543+
m_Component:
544+
- component: {fileID: 2503255335527640216}
545+
m_Layer: 0
546+
m_Name: Opening
547+
m_TagString: Untagged
548+
m_Icon: {fileID: 0}
549+
m_NavMeshLayer: 0
550+
m_StaticEditorFlags: 0
551+
m_IsActive: 1
552+
--- !u!4 &2503255335527640216
553+
Transform:
554+
m_ObjectHideFlags: 0
555+
m_CorrespondingSourceObject: {fileID: 0}
556+
m_PrefabInstance: {fileID: 0}
557+
m_PrefabAsset: {fileID: 0}
558+
m_GameObject: {fileID: 8056186602030909206}
559+
m_LocalRotation: {x: 0.7071067, y: -0, z: -0, w: 0.70710695}
560+
m_LocalPosition: {x: 0.08482254, y: -0.00011878262, z: 0}
561+
m_LocalScale: {x: -0.5651069, y: -2.7499967, z: -0.6196529}
562+
m_Children: []
563+
m_Father: {fileID: 4091439487445261377}
564+
m_RootOrder: 1
565+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

0 commit comments

Comments
 (0)