chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.36.00

Browse Source
This commit is contained in:
Razmoth
2024-01-27 20:42:18 +04:00
parent 873597730c
commit e19d7b91fe
26 changed files with 484 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AssetStudio.Utility/AssetStudio.Utility.csproj
View File

@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<Version>1.36.00</Version>
<AssemblyVersion>1.36.00</AssemblyVersion>
<FileVersion>1.36.00</FileVersion>
<Copyright>Copyright © Perfare 2018-2022</Copyright>
<DebugType>embedded</DebugType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

7
AssetStudio.Utility/ModelConverter.cs
View File

@@ -712,8 +712,9 @@ namespace AssetStudio
iMat.Textures.Add(texture);
int dest = -1;
if (options.texs.TryGetValue(texEnv.Key, out var targetDest))
dest = targetDest;
var entry = options.texs.FirstOrDefault(x => x.Value == texEnv.Key);
if (!entry.Equals(default))
dest = entry.Key;
else if (texEnv.Key == "_MainTex")
dest = 0;
else if (texEnv.Key == "_BumpMap")
@@ -1173,7 +1174,7 @@ namespace AssetStudio
public Game game;
public bool collectAnimations;
public Dictionary<string, (bool, int)> uvs;
public Dictionary<string, int> texs;
public Dictionary<int, string> texs;
}
}
}