Merge branch 'katboi01:master' into master

This commit is contained in:
Darker
2023-06-18 18:01:57 +08:00
committed by GitHub
12 changed files with 2078 additions and 212 deletions
+1
View File
@@ -63,6 +63,7 @@ public class UmaUIContainer : MonoBehaviour
public Text Text;
public Button Button;
public Slider Slider;
public Toggle Toggle;
public Image Image;
public Image ToggleImage;
}
+57
View File
@@ -75,6 +75,7 @@ public class UmaContainer : MonoBehaviour
[Header("Other")]
public CharaShaderEffectData ShaderEffectData;
private List<MaterialHelper> Materials = new List<MaterialHelper>();
public void Initialize()
{
@@ -142,6 +143,38 @@ public class UmaContainer : MonoBehaviour
UmaAnimator.avatar = AvatarBuilder.BuildGenericAvatar(gameObject, gameObject.name);
OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController);
UmaAnimator.runtimeAnimatorController = OverrideController;
//Materials
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
{
for(int i = 0; i < rend.materials.Length; i++)
{
Material mat = rend.materials[i];
var matHlp = Materials.FirstOrDefault(m => m.Mat == mat);
if (matHlp == null)
{
matHlp = new MaterialHelper()
{
Mat = mat,
Renderers = new Dictionary<Renderer, List<int>>(),
Toggle = Instantiate(UmaViewerUI.Instance.UmaContainerTogglePrefab, UmaViewerUI.Instance.MaterialsList.content)
};
matHlp.Toggle.Name = mat.name;
matHlp.Toggle.Toggle.onValueChanged.AddListener((value) => { Debug.Log("e"); matHlp.ToggleMaterials(value); });
Materials.Add(matHlp);
}
if (!matHlp.Renderers.ContainsKey(rend))
{
matHlp.Renderers.Add(rend, new List<int> { i });
}
else
{
matHlp.Renderers[rend].Add(i);
}
}
}
}
public void MergeHairModel()
@@ -305,4 +338,28 @@ public class UmaContainer : MonoBehaviour
UpBodyBone.transform.localRotation = UpBodyRotation;
}
}
class MaterialHelper
{
public Material Mat;
public UmaUIContainer Toggle;
public Dictionary<Renderer, List<int>> Renderers;
public void ToggleMaterials(bool value)
{
foreach(var rend in Renderers)
{
Debug.Log(rend.Key.name);
Material[] mat = new Material[rend.Key.materials.Length];
for(int i = 0; i < mat.Length; i++)
{
//if material slot is not in list, keep current material
//if material slot in list and toggle is on - assign original
//if material slot in list and toggle is off - assign invisible
mat[i] = rend.Value.Contains(i) ? (value? Mat : UmaViewerBuilder.Instance.TransMaterialCharas ): rend.Key.materials[i];
}
rend.Key.materials = mat;
}
}
}
}
@@ -98,15 +98,15 @@ public class UmaDatabaseController
static IEnumerable<UmaDatabaseEntry> ReadMeta(SqliteConnection conn)
{
List<UmaDatabaseEntry> entries = new List<UmaDatabaseEntry>();
SqliteCommand sqlite_cmd = conn.CreateCommand();
sqlite_cmd.CommandText = "SELECT m,n,h,c,d FROM a";
SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader();
while (sqlite_datareader.Read())
{
UmaDatabaseEntry entry = null;
try
{
UmaDatabaseEntry entry = new UmaDatabaseEntry()
entry = new UmaDatabaseEntry()
{
Type = (UmaFileType)Enum.Parse(typeof(UmaFileType), sqlite_datareader["m"] as String),
Name = sqlite_datareader["n"] as String,
@@ -114,11 +114,12 @@ public class UmaDatabaseController
Checksum = sqlite_datareader["c"].ToString(),
Prerequisites = sqlite_datareader["d"] as String
};
entries.Add(entry);
}
catch(Exception e) { Debug.LogError("Error caught: " + e); }
if (entry != null)
yield return entry;
}
return entries;
}
static IEnumerable<DataRow> ReadCharaMaster(SqliteConnection conn)
+5 -1
View File
@@ -1367,7 +1367,7 @@ public class UmaViewerBuilder : MonoBehaviour
private void LoadFaceMorph(int id, string costumeId)
{
if (!CurrentUMAContainer.Head) return;
var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name.EndsWith("3d/animator/drivenkeylocator"));
var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name == "3d/animator/drivenkeylocator");
var bundle = AssetBundle.LoadFromFile(locatorEntry.FilePath);
Main.LoadedBundles.Add(locatorEntry.Name, bundle);
var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject;
@@ -1836,6 +1836,10 @@ public class UmaViewerBuilder : MonoBehaviour
UmaViewerUI.Instance.currentFaceDrivenKeyTarget = null;
UmaViewerUI.Instance.LoadEmotionPanels(null);
UmaViewerUI.Instance.LoadFacialPanels(null);
foreach(Transform t in UmaViewerUI.Instance.MaterialsList.content)
{
Destroy(t.gameObject);
}
Destroy(CurrentUMAContainer.gameObject);
}
}
+2
View File
@@ -40,6 +40,7 @@ public class UmaViewerUI : MonoBehaviour
public ScrollRect PropList;
public PageManager PropPageCtrl;
public ScrollRect SceneList;
public ScrollRect MaterialsList;
public PageManager ScenePageCtrl;
public ScrollRect MessageScrollRect;
public Text MessageText;
@@ -118,6 +119,7 @@ public class UmaViewerUI : MonoBehaviour
public GameObject UmaContainerLivePrefab;
public GameObject UmaContainerSliderPrefab;
public GameObject UmaContainerAssetsPrefab;
public UmaUIContainer UmaContainerTogglePrefab;
private int LoadedAssetCount = 0;
[SerializeField] private RectTransform LoadedAssetsPanel;
@@ -1,161 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class RuntimeInitializer : MonoBehaviour
{
// Use this for initialization
void Start()
{
}
// Update is called once per frame
void Update()
{
}
private void OnDestroy()
{
#if UNITY_EDITOR
#elif UNITY_STANDALONE
int isfull = Screen.fullScreen ? 1 : 0;
SaveManager.SetInt("ScreenMode", isfull);
if(isfull == 0)
{
SaveManager.SetInt("ScreenWidth", Screen.width);
SaveManager.SetInt("ScreenHeight", Screen.height);
}
SaveManager.Save();
#endif
}
/// <summary>
/// 明示的に初期化する場合
/// </summary>
public static void CallInitialize()
{
InitializeBeforeSceneLoad();
}
//[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
private static void InitializeBeforeSceneLoad()
{
SaveManager.GetString("先にセーブデータを作成します");
#if UNITY_EDITOR
#elif UNITY_STANDALONE
//画面の解像度を設定する
int isFullScreen = SaveManager.GetInt("ScreenMode", 1);
if(isFullScreen == 1)
{
int width = Screen.currentResolution.width;
int height = Screen.currentResolution.height;
Screen.SetResolution(width, height, true);
SaveManager.SetInt("ScreenWidth", width);
SaveManager.SetInt("ScreenHeight", height);
}
else
{
int width = SaveManager.GetInt("ScreenWidth", 1280);
int height = SaveManager.GetInt("ScreenHeight", 720);
Screen.SetResolution(width, height, false);
SaveManager.SetInt("ScreenWidth", width);
SaveManager.SetInt("ScreenHeight", height);
}
SaveManager.SetInt("ScreenMode", isFullScreen);
SaveManager.Save();
#endif
//フレームレートの設定を行う
int DontSync = SaveManager.GetInt("vSyncSetting", 1); //デフォルトは垂直同期無し
if (DontSync == 1)
{
QualitySettings.vSyncCount = 0;
int FrameRate = SaveManager.GetInt("FrameRate", 1); //デフォルト60
switch (FrameRate)
{
case 0:
Application.targetFrameRate = 30;
break;
case 1:
//Every VBlank(60fps)
Application.targetFrameRate = 60;
break;
case 2:
//Every VBlank(120fps)
Application.targetFrameRate = 120;
break;
}
SaveManager.SetInt("FrameRate", FrameRate);
}
else
{
QualitySettings.vSyncCount = 1;
int FrameRate = SaveManager.GetInt("FrameRate", 1); //デフォルト60
switch (FrameRate)
{
case 0:
//Every Second VBlank(60fpsの半分)
QualitySettings.vSyncCount = 2;
Application.targetFrameRate = 60;
break;
case 1:
//Every VBlank(60fps)
Application.targetFrameRate = 60;
break;
case 2:
//Every VBlank(120fps)
Application.targetFrameRate = 120;
break;
}
SaveManager.SetInt("FrameRate", FrameRate);
}
SaveManager.SetInt("vSyncSetting", DontSync);
SaveManager.Save();
// ScriptableObjectテーブルから情報を取得し設定する。
var table = Resources.Load("InitializerTable") as InitializerTable;
if (table != null)
{
GameObject obj1 = GameObject.Find("AssetManager");
if (obj1 == null)
{
GameObject assetManager = Instantiate(table.AssetManager);
assetManager.name = assetManager.name.Replace("(Clone)", "");
GameObject.DontDestroyOnLoad(assetManager);
}
GameObject obj2 = GameObject.Find("ViewLauncher");
if (obj2 == null)
{
GameObject viewLauncher = Instantiate(table.ViewLauncher);
viewLauncher.name = viewLauncher.name.Replace("(Clone)", "");
GameObject.DontDestroyOnLoad(viewLauncher);
}
GameObject obj3 = GameObject.Find("UIManager");
if (obj3 == null)
{
GameObject uiManager = Instantiate(table.UIManager);
uiManager.name = uiManager.name.Replace("(Clone)", "");
GameObject.DontDestroyOnLoad(uiManager);
}
GameObject obj4 = GameObject.Find("ResourceManager");
if (obj4 == null)
{
GameObject resourceManager = Instantiate(table.ResourcesManager);
resourceManager.name = resourceManager.name.Replace("(Clone)", "");
GameObject.DontDestroyOnLoad(resourceManager);
}
}
}
}
@@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: ab30c2ca30e1a144c97b8e0cc5c3d316
timeCreated: 1535288250
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: