Merge branch 'croakfang:master' into master

This commit is contained in:
Jacob Tarun
2022-09-27 14:46:23 +08:00
committed by GitHub
347 changed files with 4213 additions and 807 deletions
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 563cc63bc4fc0504aa33590e2d263881
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,24 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
public class LoadSound : ScriptableObject
{
UmaViewerMain Main => UmaViewerMain.Instance;
public struct UmaSoundInfo
{
public string acbPath;
public string awbPath;
}
public UmaSoundInfo getSoundPath(string name) {
UmaSoundInfo info;
info.acbPath = UmaDatabaseController.GetABPath(Main.AbList.FirstOrDefault(a => a.Name.Contains(name) && a.Name.EndsWith("acb")));
info.awbPath = UmaDatabaseController.GetABPath(Main.AbList.FirstOrDefault(a => a.Name.Contains(name) && a.Name.EndsWith("awb")));
return info;
}
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d7b0dd94109f6b445bd06165e34aea69
guid: ef2081963b0a68f4e8558e38b24cc264
MonoImporter:
externalObjects: {}
serializedVersion: 2
@@ -117,7 +117,7 @@ public class CriWareBuildPreprocessExcecutor :
propertyDisableUnityAudio.boolValue = false;
}
} else {
propertyDisableUnityAudio.boolValue = true;
propertyDisableUnityAudio.boolValue = false;
}
audioManager.ApplyModifiedProperties();

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Some files were not shown because too many files have changed in this diff Show More