fix: 合并后编译错误
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -686,7 +686,6 @@ namespace AibisDream.FixSystem
|
||||
public IEnumerator Enter()
|
||||
{
|
||||
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
||||
var screenSystem = FixSystemCenter.SystemDic.Get<ScreenSystem>();
|
||||
if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule))
|
||||
{
|
||||
bodyModuleSystem.SwitchModuleGroup(ModuleState.Head);
|
||||
@@ -716,10 +715,10 @@ namespace AibisDream.FixSystem
|
||||
Debug.Log("[SalesState] Loaded bubble slots from SalesManager.");
|
||||
DialogUIManager.Instance.LoadBubbles(data);
|
||||
}
|
||||
else if (screenSystem.BubbleSlotGroup != null)
|
||||
else
|
||||
{
|
||||
Debug.LogWarning("[SalesState] SalesManager.bubbleSlotGroup is null, fallback to ScreenSystem bubble slots.");
|
||||
var data = screenSystem.BubbleSlotGroup.CollectData();
|
||||
var data = FixPanelSystem.Instance.BubbleSlotGroup.CollectData();
|
||||
DialogUIManager.Instance.LoadBubbles(data);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using Object = UnityEngine.Object;
|
||||
using System.Globalization;
|
||||
#if UNITY_EDITOR
|
||||
|
||||
Reference in New Issue
Block a user