JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into LouDi_Quan

Browse Source
This commit is contained in:
shenjianxing 2024-12-30 16:14:48 +08:00
commit 95ac8d00ad
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Controller/StateMachineController.cs
View File

@ -37,7 +37,7 @@ public class StateMachineController : MonoSingleton<StateMachineController>
private void OnStart(OnModuleStart start) private void OnStart(OnModuleStart start)
{ {
foreach (var item in Global.Instance.appData.Modules[0].FSM) foreach (var item in Global.Instance.curModule.FSM)
{ {
FSM<string> fsm = new FSM<string>(); FSM<string> fsm = new FSM<string>();
var fsmInfo = new FsmInfo(); var fsmInfo = new FsmInfo();

5
Assets/Scripts/UI/UITools.cs
View File

@ -44,6 +44,11 @@ namespace QFramework.Example
foreach (var device in mData.devices) foreach (var device in mData.devices)
{ {
var item = DeviceController.Instance.GetDevice(device); var item = DeviceController.Instance.GetDevice(device);
if (item==null)
{
Debug.LogError(device + ":没有找到对应的Device配置");
return;
}
GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content); GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content);
obj.name = item.Name; obj.name = item.Name;
obj.transform.Find("Name").GetComponent<TextMeshProUGUI>().text = item.Name; obj.transform.Find("Name").GetComponent<TextMeshProUGUI>().text = item.Name;