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

# Conflicts:
#	Assets/Scenes/00_Fight_Arena/Fight_Arena.unity
#	Assets/Scripts/Characters/Skills/Spell_PurifyingBlaze.asset
This commit is contained in:
2026-01-22 15:03:04 +01:00
5 changed files with 141 additions and 155 deletions

View File

@@ -132,6 +132,7 @@ Material:
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0.1
- _DstBlend: 1
- _DstBlendAlpha: 1
- _EmissionEnabled: 0
- _EnvironmentReflections: 1
- _FlipbookBlending: 0
@@ -158,6 +159,7 @@ Material:
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _SrcBlendAlpha: 1
- _StencilCompare: 6
- _StencilRef: 0
- _Surface: 1