marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/NewStory' into NewStory

Browse Source 
# Conflicts:
#	Assets/Scenes/Fight_Arena/Fight_Arena.unity
This commit is contained in:
Szymon Miś
2025-09-09 02:45:19 +02:00
parent 2437efe614 8067a01b8e
commit 3b0b20a165
22 changed files with 2573 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1887
Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Animations/Longsword_Animset_pt2.fbx.meta vendored
View File

File diff suppressed because it is too large Load Diff

2
Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampArmsLegs_MAT.mat vendored
View File

@@ -68,7 +68,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: ecfd8dee444853641b96003ca2f834e8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

3
Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampEyeRetinaMAT.mat vendored
View File

@@ -25,6 +25,7 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@@ -122,7 +123,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.13}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 0.13}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.29411763, g: 0.29411763, b: 0.29411763, a: 1}
m_BuildTextureStacks: []

2
Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampHeadMAT.mat vendored
View File

@@ -68,7 +68,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 586f46705bac2a64383b5a9f7b024323, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

2
Assets/ThirdParty/ANIMATIONS/LongswordAnimsetPro/Models/Vampire/Materials/VampTorsoMAT.mat vendored
View File

@@ -68,7 +68,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 3038f9b0643c18c4c9f7ece56db63dca, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: