Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a more explosive looking explosive barrel model #732

Merged
merged 4 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions Assets/Materials/Props/ExplodingBarrel.mat
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ExplodingBarrel
m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 47658d4b501a04a40a24c4eec631a846, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- MAIN_LIGHT_CALCULATE_SHADOWS
- _MAIN_LIGHT_SHADOWS_CASCADE
- _SHADOWS_CASCADE
- _SHADOWS_SOFT
m_InvalidKeywords: []
m_LightmapFlags: 4
Expand Down Expand Up @@ -58,12 +58,16 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Metallic_Texture:
- _Metallic_Map:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Metallic_Texture:
m_Texture: {fileID: 2800000, guid: a352cc10e02c3b74fab6d96cbf170298, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Normal_Map:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 537697ee58e867b489a70491f08848a9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
Expand All @@ -74,24 +78,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_ff3f3dfb8d024d00a3406fb548bfed46_Texture_1:
m_Texture: {fileID: 2800000, guid: 2f6a188b3fdeed84e9663c94fc54cd49, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture:
m_Texture: {fileID: 2800000, guid: e20a751f8170ea94b8ed0046bc8a2b8c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_0910a226a35b49eaa87ebc7a7af0a7de_Texture_1:
m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_6ca021b8b8b84617a472c2608835416d_Texture_1:
m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3}
m_Texture: {fileID: 2800000, guid: a856a20ed8e07f648bcc25ce4e9ab6be, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_8082379ce2a14f38b8de533a506ee294_Texture_1:
Expand Down Expand Up @@ -134,31 +126,33 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _PulseStrength: 0.7
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SHADOWS_CASCADE: 1
- _SHADOWS_SOFT: 1
- _Shadow_Texture: 0
- _Smoothness: 0.5
- _Smoothness: 0.51
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Texture_Intensity: 1
- _Use_Normal_Map: 0
- _Texture_Intensity: 1.69
- _Use_Normal_Map: 1
- _Use_Specular: 1
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _PulseColor: {r: 0.9339623, g: 0.20617655, b: 0.20617655, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Specular: {r: 1, g: 1, b: 1, a: 1}
- _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &5646002361800739478
--- !u!114 &1740427578700151096
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Materials/Props/ExplodingBarrel.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

173 changes: 173 additions & 0 deletions Assets/Materials/Props/ExplodingBarrelSimple.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ExplodingBarrelSimple
m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- MAIN_LIGHT_CALCULATE_SHADOWS
- _MAIN_LIGHT_SHADOWS_CASCADE
- _SHADOWS_SOFT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Metallic_Texture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Normal_Map:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_ff3f3dfb8d024d00a3406fb548bfed46_Texture_1:
m_Texture: {fileID: 2800000, guid: 2f6a188b3fdeed84e9663c94fc54cd49, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture:
m_Texture: {fileID: 2800000, guid: e20a751f8170ea94b8ed0046bc8a2b8c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_0910a226a35b49eaa87ebc7a7af0a7de_Texture_1:
m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_6ca021b8b8b84617a472c2608835416d_Texture_1:
m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Triplanar_8082379ce2a14f38b8de533a506ee294_Texture_1:
m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- MAIN_LIGHT_CALCULATE_SHADOWS: 1
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _MAIN_LIGHT_SHADOWS_CASCADE: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SHADOWS_SOFT: 1
- _Shadow_Texture: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Texture_Intensity: 1
- _Use_Normal_Map: 0
- _Use_Specular: 1
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Specular: {r: 1, g: 1, b: 1, a: 1}
- _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &5646002361800739478
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
8 changes: 8 additions & 0 deletions Assets/Materials/Props/ExplodingBarrelSimple.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion Assets/Models/GunParts/CannonBarrel.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Models/Props/EvenMoreExplosiveBarrel.fbx
Binary file not shown.
Loading