Skip to content

VFX Optimization Pass #584

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

Merged
merged 3 commits into from
Mar 29, 2022
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
4 changes: 2 additions & 2 deletions Assets/BossRoom/VFX/Materials/FX_M_Glow_13.mat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 44258c27af4187648ba0a44cb3dbb6f6, type: 3}
m_Texture: {fileID: 2800000, guid: 78f5b23dbc61d1042b153173e9609b8e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand Down Expand Up @@ -108,7 +108,7 @@ Material:
- Color_acca830da4044b5fa948c859784be316: {r: 1.741101, g: 1.741101, b: 1.741101, a: 1}
- Vector4_1f7562654797436e96becd4b67df1223: {r: 1, g: 1, b: 0, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1.741101, g: 1.741101, b: 1.741101, a: 1}
- _Color: {r: 1.4993067, g: 1.4993067, b: 1.4993067, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.08235294}
Expand Down
18 changes: 9 additions & 9 deletions Assets/BossRoom/VFX/Materials/FX_M_Glow_14.mat
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ Material:
serializedVersion: 3
m_TexEnvs:
- Texture2D_0d51a7f662f34825885706c5f9f5b378:
m_Texture: {fileID: 2800000, guid: 09ff3236ed6851c44b22b13107c206f5, type: 3}
m_Texture: {fileID: 2800000, guid: 5c1bc500c0752bb4f93e891d21ebc8d5, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_a49f118ec4654c468718c10acb0d11fb:
m_Texture: {fileID: 2800000, guid: 492f999ed565a8d479affe24f11a657e, type: 3}
m_Texture: {fileID: 2800000, guid: 4de729983701e7b40a88baf0fd819a76, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_ebc59c3a4789414dbc640714ca8cd838:
m_Texture: {fileID: 2800000, guid: 60781adef564aeb439a036d89cc5545e, type: 3}
m_Texture: {fileID: 2800000, guid: 27964659a7d4fef44ba88a7b6967fa31, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
Expand Down Expand Up @@ -97,14 +97,14 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Boolean_3d21c72f19314834bd7b68bd1945e5ed: 1
- Boolean_3f723681939f4ad0be5abc28767056a0: 0
- Boolean_3d21c72f19314834bd7b68bd1945e5ed: 0
- Boolean_3f723681939f4ad0be5abc28767056a0: 1
- Boolean_b14a61a83cf04832bfc5e28ac9dc002f: 1
- Boolean_b2d3c01bbc4040b69679a702e03700d7: 0
- Boolean_e207d7c3c7c54fe9a2fedb5c72933240: 0
- Boolean_e207d7c3c7c54fe9a2fedb5c72933240: 1
- Boolean_e207d7c3c7c54fe9a2fedb5c72933240_1: 0
- Boolean_ebca1713bc2a4fcea5fa60c01ccce53f: 1
- Vector1_1: 0.15
- Vector1_1: 0.218
- Vector1_49a02738d71c4444862d3f695e709242: 1
- Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1
- Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1
Expand Down Expand Up @@ -147,9 +147,9 @@ Material:
- _ZWrite: 1
- __dirty: 0
m_Colors:
- Color_1808cb51d9804f419fb05b86068c676a: {r: 1.5789101, g: 1.5789101, b: 1.5789101, a: 1}
- Color_1808cb51d9804f419fb05b86068c676a: {r: 1.838149, g: 1.838149, b: 1.838149, a: 1}
- Vector4_1: {r: 1, g: 1, b: 0, a: 0}
- Vector4_1d8f01040b1f48af90ee158d67035434: {r: 0.2, g: 0.2, b: 0.5, a: 0}
- Vector4_1d8f01040b1f48af90ee158d67035434: {r: 0.36, g: 0.27, b: 0.22, a: 0.14}
- Vector4_2: {r: 1, g: 1, b: 0, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1.5789101, g: 1.5789101, b: 1.5789101, a: 1}
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/VFX/Meshes/FX_Ms_Billboard.fbx
Git LFS file not shown
3 changes: 0 additions & 3 deletions Assets/BossRoom/VFX/Meshes/FX_Ms_SlahsShape.fbx

This file was deleted.

3 changes: 3 additions & 0 deletions Assets/BossRoom/VFX/Meshes/FX_Ms_SlashShape.fbx
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/VFX/Meshes/FX_Slash.fbx
Git LFS file not shown
14 changes: 7 additions & 7 deletions Assets/BossRoom/VFX/Prefabs/Archer/FX_arrow.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ TrailRenderer:
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.1
m_MinVertexDistance: 2.5
m_Autodestruct: 0
m_Emitting: 1
--- !u!1 &8790122182938586074
Expand All @@ -240,7 +240,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &8790122182938586075
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5064,7 +5064,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8790122182988832536}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9112595075296351182}
Expand Down Expand Up @@ -5141,8 +5141,8 @@ TrailRenderer:
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 0.6556604, g: 1, b: 0.67861634, a: 1}
key1: {r: 0.18212414, g: 1, b: 0, a: 0}
key0: {r: 0.18212414, g: 1, b: 0, a: 0.7058824}
key1: {r: 0.6556604, g: 1, b: 0.67861634, a: 0}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
Expand Down Expand Up @@ -5174,7 +5174,7 @@ TrailRenderer:
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.1
m_MinVertexDistance: 2.5
m_Autodestruct: 0
m_Emitting: 1
--- !u!1 &8790122183726792699
Expand Down Expand Up @@ -5312,6 +5312,6 @@ TrailRenderer:
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.1
m_MinVertexDistance: 2.5
m_Autodestruct: 0
m_Emitting: 1
16 changes: 16 additions & 0 deletions Assets/BossRoom/VFX/Prefabs/Archer/fx_ArrowGraphics.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,22 @@ PrefabInstance:
propertyPath: m_Name
value: FX_arrow
objectReference: {fileID: 0}
- target: {fileID: 8790122182988832537, guid: 660b64eb444497d41af2c727909eb671, type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8790122182988832537, guid: 660b64eb444497d41af2c727909eb671, type: 3}
propertyPath: m_LocalPosition.z
value: 0.153
objectReference: {fileID: 0}
- target: {fileID: 8790122182988832538, guid: 660b64eb444497d41af2c727909eb671, type: 3}
propertyPath: m_Time
value: 0.15
objectReference: {fileID: 0}
- target: {fileID: 8790122182988832538, guid: 660b64eb444497d41af2c727909eb671, type: 3}
propertyPath: m_MinVertexDistance
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9112595075296351182, guid: 660b64eb444497d41af2c727909eb671, type: 3}
propertyPath: m_RootOrder
value: 0
Expand Down
Loading