fix(framework): 修复 ActionKit 和 TimelineKit 相关问题
This commit is contained in:
@@ -1,12 +1,4 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 2016 - 2024 liangxiegame UNDER MIT License
|
||||
*
|
||||
* https://qframework.cn
|
||||
* https://github.com/liangxiegame/QFramework
|
||||
* https://gitee.com/liangxiegame/QFramework
|
||||
****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
namespace AibisDream.Kit
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 2015 - 2024 liangxiegame UNDER MIT License
|
||||
*
|
||||
* https://qframework.cn
|
||||
* https://github.com/liangxiegame/QFramework
|
||||
* https://gitee.com/liangxiegame/QFramework
|
||||
****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace AibisDream.Kit
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using AibisDream.FixSystem;
|
||||
@@ -335,7 +335,7 @@ namespace AibisDream.Kit
|
||||
{
|
||||
return key switch
|
||||
{
|
||||
"ExpressFixScene" => AmbState.Clinic,
|
||||
"Scene/ExpressFixScene" => AmbState.Clinic,
|
||||
"ShitouHeadiFixScene" => AmbState.Clinic,
|
||||
"PeipeiFixScene" => AmbState.Clinic,
|
||||
"Bridge" => AmbState.Footbridge,
|
||||
|
||||
@@ -197,6 +197,12 @@ namespace AibisDream
|
||||
}
|
||||
|
||||
director.Play();
|
||||
|
||||
// 等待播放完成
|
||||
while (director.state == PlayState.Playing)
|
||||
{
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -3,9 +3,13 @@
|
||||
public static class TimelineAssetRef
|
||||
{
|
||||
// ------------------- 维修面板相关 -------------------
|
||||
public const string BlockPuzzleEnter = "维修面板/引擎仓面板开启";
|
||||
public const string BlockPuzzleExit = "维修面板/引擎仓面板关闭";
|
||||
public const string CablePanelEnter = "维修面板/插线面板开启";
|
||||
public const string CablePanelExit = "维修面板/插线面板关闭";
|
||||
public const string BlockPuzzleEnter = "引擎仓面板/引擎仓面板开启";
|
||||
public const string BlockPuzzleExit = "引擎仓面板/引擎仓面板关闭";
|
||||
public const string CablePanelEnter = "插线面板/插线面板开启";
|
||||
public const string CablePanelExit = "插线面板/插线面板关闭";
|
||||
|
||||
// ------------------- 插线模块相关 -------------------
|
||||
public const string EngineModuleEnter = "引擎模块/引擎开盖";
|
||||
public const string EngineModuleExit = "引擎模块/引擎合盖";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using AibisDream.Kit;
|
||||
@@ -116,6 +116,12 @@ namespace AibisDream.Utility
|
||||
return visitedState == (1 << totalOptionNum) - 1;
|
||||
}
|
||||
|
||||
[YarnFunction("str_contains")]
|
||||
public static bool StrContains(string str, string substring)
|
||||
{
|
||||
return str.Contains(substring);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user