Skip to content

Commit

Permalink
Add yielding to auction, fix specular sign, fix lod player color
Browse files Browse the repository at this point in the history
  • Loading branch information
Fueredoriku committed Jul 12, 2024
1 parent 9bf881f commit e0810dd
Show file tree
Hide file tree
Showing 29 changed files with 5,339 additions and 22 deletions.
160 changes: 160 additions & 0 deletions Assets/Materials/AuctionHall/YieldSign.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1124526986912809124
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
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: YieldSign
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: 2800000, guid: 31bdb36f4ccea1f4bba7cb78fa6efaf8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Normal_Map:
m_Texture: {fileID: 2800000, guid: 004afaf87e896a0458d805cb54ed87b7, type: 3}
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}
- _Texture:
m_Texture: {fileID: 2800000, guid: 7caa24f1369ca6440aae56359baa8881, 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: 1
- _Smoothness: 1.14
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Texture_Intensity: 1
- _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}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/AuctionHall/YieldSign.mat.meta

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

2 changes: 1 addition & 1 deletion Assets/Materials/Player/Sign.mat
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Material:
- _ReceiveShadows: 1
- _SHADOWS_SOFT: 1
- _Shadow_Texture: 0
- _Smoothness: 0.5
- _Smoothness: 1.77
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/Materials/Player/SignDither.mat
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Material:
- _Surface: 0
- _Texture_Intensity: 1
- _Use_Normal_Map: 0
- _Use_Specular: 1
- _Use_Specular: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
Expand Down
2 changes: 1 addition & 1 deletion Assets/Materials/Player/SignScreenDither.mat
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Material:
- _Surface: 0
- _Texture_Intensity: 1
- _Use_Normal_Map: 0
- _Use_Specular: 1
- _Use_Specular: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
Expand Down
Binary file added Assets/Models/AuctionHall/yieldSign.fbx
Binary file not shown.
108 changes: 108 additions & 0 deletions Assets/Models/AuctionHall/yieldSign.fbx.meta

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

Loading

0 comments on commit e0810dd

Please sign in to comment.