Skip to content

Commit 02edff9

Browse files
committed
Add BasicTankShell and enhance BasicBullet visuals
Introduces the BasicTankShell ammunition with associated assets, scripts, and prefabs. Updates the BasicBullet prefab to include new visual effects such as spark and trail, and adds supporting materials and textures. Modifies vehicle and scene files to integrate the new ammunition type.
1 parent bcff55a commit 02edff9

31 files changed

+11202
-56
lines changed

Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicBullet/BasicBullet.prefab

Lines changed: 4964 additions & 35 deletions
Large diffs are not rendered by default.
Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: BulletSpark_Mat
11+
m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords:
16+
- _FLIPBOOKBLENDING_OFF
17+
m_LightmapFlags: 4
18+
m_EnableInstancingVariants: 0
19+
m_DoubleSidedGI: 0
20+
m_CustomRenderQueue: -1
21+
stringTagMap: {}
22+
disabledShaderPasses: []
23+
m_LockedProperties:
24+
m_SavedProperties:
25+
serializedVersion: 3
26+
m_TexEnvs:
27+
- _BaseMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _BumpMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _DetailAlbedoMap:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _DetailMask:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _DetailNormalMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _EmissionMap:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _MainTex:
52+
m_Texture: {fileID: 2800000, guid: adc08d6b8eb071744aa343ea43bba790, type: 3}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _MetallicGlossMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _OcclusionMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _ParallaxMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- _SpecGlossMap:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- unity_Lightmaps:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- unity_LightmapsInd:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
79+
- unity_ShadowMasks:
80+
m_Texture: {fileID: 0}
81+
m_Scale: {x: 1, y: 1}
82+
m_Offset: {x: 0, y: 0}
83+
m_Ints: []
84+
m_Floats:
85+
- _AddPrecomputedVelocity: 0
86+
- _AlphaClip: 0
87+
- _AlphaToMask: 0
88+
- _Blend: 0
89+
- _BlendModePreserveSpecular: 1
90+
- _BlendOp: 0
91+
- _BumpScale: 1
92+
- _CameraFadingEnabled: 0
93+
- _CameraFarFadeDistance: 2
94+
- _CameraNearFadeDistance: 1
95+
- _ClearCoatMask: 0
96+
- _ClearCoatSmoothness: 0
97+
- _ColorMode: 0
98+
- _Cull: 2
99+
- _Cutoff: 0.5
100+
- _DetailAlbedoMapScale: 1
101+
- _DetailNormalMapScale: 1
102+
- _DistortionBlend: 0.5
103+
- _DistortionEnabled: 0
104+
- _DistortionStrength: 1
105+
- _DistortionStrengthScaled: 0.1
106+
- _DstBlend: 0
107+
- _DstBlendAlpha: 0
108+
- _EnvironmentReflections: 1
109+
- _FlipbookBlending: 0
110+
- _FlipbookMode: 0
111+
- _GlossMapScale: 0
112+
- _Glossiness: 0
113+
- _GlossyReflections: 0
114+
- _Metallic: 0
115+
- _Mode: 0
116+
- _OcclusionStrength: 1
117+
- _Parallax: 0.005
118+
- _QueueOffset: 0
119+
- _ReceiveShadows: 1
120+
- _Smoothness: 0.5
121+
- _SmoothnessSource: 0
122+
- _SmoothnessTextureChannel: 0
123+
- _SoftParticlesEnabled: 0
124+
- _SoftParticlesFarFadeDistance: 1
125+
- _SoftParticlesNearFadeDistance: 0
126+
- _SpecularHighlights: 1
127+
- _SrcBlend: 1
128+
- _SrcBlendAlpha: 1
129+
- _Surface: 0
130+
- _WorkflowMode: 1
131+
- _ZWrite: 1
132+
m_Colors:
133+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
134+
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
135+
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
136+
- _Color: {r: 1, g: 1, b: 1, a: 1}
137+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
138+
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
139+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
140+
m_BuildTextureStacks: []
141+
m_AllowLocking: 1
142+
--- !u!114 &5128713116610163057
143+
MonoBehaviour:
144+
m_ObjectHideFlags: 11
145+
m_CorrespondingSourceObject: {fileID: 0}
146+
m_PrefabInstance: {fileID: 0}
147+
m_PrefabAsset: {fileID: 0}
148+
m_GameObject: {fileID: 0}
149+
m_Enabled: 1
150+
m_EditorHideFlags: 0
151+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
152+
m_Name:
153+
m_EditorClassIdentifier:
154+
version: 10

Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicBullet/BulletSpark_Mat.mat.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: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-3390537275186013182
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 10
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 8
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: BulletTrail_Mat
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _EMISSION
29+
m_InvalidKeywords: []
30+
m_LightmapFlags: 2
31+
m_EnableInstancingVariants: 0
32+
m_DoubleSidedGI: 0
33+
m_CustomRenderQueue: -1
34+
stringTagMap:
35+
RenderType: Opaque
36+
disabledShaderPasses:
37+
- MOTIONVECTORS
38+
m_LockedProperties:
39+
m_SavedProperties:
40+
serializedVersion: 3
41+
m_TexEnvs:
42+
- _BaseMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _BumpMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _DetailAlbedoMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _DetailMask:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _DetailNormalMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
- _EmissionMap:
63+
m_Texture: {fileID: 0}
64+
m_Scale: {x: 1, y: 1}
65+
m_Offset: {x: 0, y: 0}
66+
- _MainTex:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
70+
- _MetallicGlossMap:
71+
m_Texture: {fileID: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
- _OcclusionMap:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
78+
- _ParallaxMap:
79+
m_Texture: {fileID: 0}
80+
m_Scale: {x: 1, y: 1}
81+
m_Offset: {x: 0, y: 0}
82+
- _SpecGlossMap:
83+
m_Texture: {fileID: 0}
84+
m_Scale: {x: 1, y: 1}
85+
m_Offset: {x: 0, y: 0}
86+
- unity_Lightmaps:
87+
m_Texture: {fileID: 0}
88+
m_Scale: {x: 1, y: 1}
89+
m_Offset: {x: 0, y: 0}
90+
- unity_LightmapsInd:
91+
m_Texture: {fileID: 0}
92+
m_Scale: {x: 1, y: 1}
93+
m_Offset: {x: 0, y: 0}
94+
- unity_ShadowMasks:
95+
m_Texture: {fileID: 0}
96+
m_Scale: {x: 1, y: 1}
97+
m_Offset: {x: 0, y: 0}
98+
m_Ints: []
99+
m_Floats:
100+
- _AddPrecomputedVelocity: 0
101+
- _AlphaClip: 0
102+
- _AlphaToMask: 0
103+
- _Blend: 0
104+
- _BlendModePreserveSpecular: 1
105+
- _BumpScale: 1
106+
- _ClearCoatMask: 0
107+
- _ClearCoatSmoothness: 0
108+
- _Cull: 2
109+
- _Cutoff: 0.5
110+
- _DetailAlbedoMapScale: 1
111+
- _DetailNormalMapScale: 1
112+
- _DstBlend: 0
113+
- _DstBlendAlpha: 0
114+
- _EnvironmentReflections: 1
115+
- _GlossMapScale: 0
116+
- _Glossiness: 0
117+
- _GlossyReflections: 0
118+
- _Metallic: 0
119+
- _OcclusionStrength: 1
120+
- _Parallax: 0.005
121+
- _QueueOffset: 0
122+
- _ReceiveShadows: 1
123+
- _Smoothness: 0.5
124+
- _SmoothnessTextureChannel: 0
125+
- _SpecularHighlights: 1
126+
- _SrcBlend: 1
127+
- _SrcBlendAlpha: 1
128+
- _Surface: 0
129+
- _WorkflowMode: 1
130+
- _ZWrite: 1
131+
m_Colors:
132+
- _BaseColor: {r: 1, g: 0.9972117, b: 0, a: 1}
133+
- _Color: {r: 1, g: 0.99721164, b: 0, a: 1}
134+
- _EmissionColor: {r: 2.4398448, g: 1.2694678, b: 0, a: 1}
135+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
136+
m_BuildTextureStacks: []
137+
m_AllowLocking: 1

Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicBullet/BulletTrail_Mat.mat.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.
123 KB
Loading

0 commit comments

Comments
 (0)