Skip to content

DreamHack Visual Fix 1 #65

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.

Sign up for GitHub

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

Open
alanrtao wants to merge 2 commits into
base: main
Choose a base branch
from
Open

DreamHack Visual Fix 1 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b3f900
Update non-crystal glitter material
alanrtao Dec 16, 2023
7e41457
try to always push texture to material
alanrtao Dec 16, 2023
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
5 changes: 3 additions & 2 deletions Barkane/Assets/Materials/Crystal/Disabled Ghost.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Alpha: 0.471
- _Alpha: 0.127
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
Expand All @@ -90,6 +90,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlitterCutoff: 0.97
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
Expand All @@ -105,7 +106,7 @@ Material:
- _SrcBlend: 1
- _Surface: 0
- _Voronoi_Angle_Offset: 2
- _Voronoi_Scale: 14.31
- _Voronoi_Scale: 38.7
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
Expand Down
5 changes: 3 additions & 2 deletions Barkane/Assets/Materials/Crystal/Ghost Crystal.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Alpha: 0.601
- _Alpha: 0.382
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
Expand All @@ -90,6 +90,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlitterCutoff: 0.95
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
Expand All @@ -105,7 +106,7 @@ Material:
- _SrcBlend: 1
- _Surface: 0
- _Voronoi_Angle_Offset: 2
- _Voronoi_Scale: 14.31
- _Voronoi_Scale: 33
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
Expand Down
136 changes: 136 additions & 0 deletions Barkane/Assets/Materials/Crystal/GoalCrystal.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
%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: GoalCrystal
m_Shader: {fileID: -6465566751694194690, guid: dadc83600584ceb478651c6e6d470293, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
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}
- _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}
- _SpecGlossMap:
m_Texture: {fileID: 0}
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:
- _Alpha: 1
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlitterCutoff: 0.9
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0.241
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.523
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _Voronoi_Angle_Offset: 2
- _Voronoi_Scale: 9
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Base_Color: {r: 0.23137255, g: 0.019607844, b: 1, a: 0}
- _Bottom_Color: {r: 0, g: 0.038066864, b: 1, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Edge_Color: {r: 1.7041142, g: 0.72156864, b: 1.8509804, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Glitter_1: {r: 0.9622641, g: 0.7836878, b: 0.5946066, a: 0}
- _Glitter_2: {r: 0.48126554, g: 0.99056596, b: 0.8672617, a: 0}
- _Glitter_3: {r: 0.9400021, g: 0.5093005, b: 0.99056596, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &5344342493736221596
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: 5
8 changes: 8 additions & 0 deletions Barkane/Assets/Materials/Crystal/GoalCrystal.mat.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Barkane/Assets/Materials/Model Extractions/Marmalade/CB_Silhouette.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.92549026, g: 0.28235295, b: 0.5686275, a: 1}
- _BaseColor: {r: 1, g: 0.41960785, b: 0.44705883, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0.92549026, g: 0.28235292, b: 0.5686274, a: 1}
- _Color: {r: 1, g: 0.41960782, b: 0.4470588, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
Expand Down
2 changes: 1 addition & 1 deletion Barkane/Assets/Prefabs/Mechanics/Goal.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 0bbf3e7c898443f4fa93705d64a1f01e, type: 2}
- {fileID: 2100000, guid: 9c9831a4451ce834c8c67871e14ebb43, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
Loading