Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

# Conflicts:
#	Assets/Scenes/02_Ruined_Town/Ruined_Town.unity
This commit is contained in:
2025-10-27 12:16:00 +01:00
25 changed files with 95558 additions and 4655 deletions

View File

@@ -15,6 +15,7 @@ Material:
m_ValidKeywords:
- USEDISSOLVE_WITHOUT_ALPHA_CUTOUT
- USEFRESNEL
- _ALPHAPREMULTIPLY_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT
@@ -138,7 +139,7 @@ Material:
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _SrcBlend: 1
- _Surface: 1
- _Threshold: 0
- _USEDISSOLVE: 1