From 03157a9b3a11e8403a57c2882ff5a4e4a95e3c47 Mon Sep 17 00:00:00 2001 From: yangjing Date: Tue, 15 Feb 2022 12:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=94=BB=E5=90=8D=E7=A7=B0=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=92=8C=E9=80=BB=E8=BE=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Game/Film.cs | 10 +++++++++- Assets/Scripts/Game/GameLogic.cs | 3 ++- .../Resources/SRDebugger/UI/Prefabs/Trigger.prefab | 2 +- .../SRDebugger/usr/Resources/SRDebugger/Settings.asset | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Game/Film.cs b/Assets/Scripts/Game/Film.cs index c109ab64..3ba64d93 100644 --- a/Assets/Scripts/Game/Film.cs +++ b/Assets/Scripts/Game/Film.cs @@ -16,6 +16,14 @@ public class Film : MonoBehaviour if (mAni == null) return; - mAni.Play(pSceneCode); + if (!mAni.HasState(0, Animator.StringToHash(pSceneCode)))//兼容1-1-2这种 + { + string tNewCode = pSceneCode.Replace("_", "-"); + mAni.Play(tNewCode); + } + else + { + mAni.Play(pSceneCode); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Game/GameLogic.cs b/Assets/Scripts/Game/GameLogic.cs index 1367abbd..4be9b59d 100644 --- a/Assets/Scripts/Game/GameLogic.cs +++ b/Assets/Scripts/Game/GameLogic.cs @@ -68,7 +68,8 @@ public class GameLogic : MonoBehaviour if (tEndingID >= 0) { bool tHasNew = PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID); - + tHasComplete = PlayerData.Instance.EndingCountOfLevel(PlayerData.Instance.CurrentLevelID) == tLvData.Endings.Count; + EndingData tEdData = tLvData.Endings[tEndingID]; if (tEdData.IsGoodEnding) { diff --git a/Assets/ThirdPlugins/StompyRobot/SRDebugger/Resources/SRDebugger/UI/Prefabs/Trigger.prefab b/Assets/ThirdPlugins/StompyRobot/SRDebugger/Resources/SRDebugger/UI/Prefabs/Trigger.prefab index 47f21617..74fcfd0b 100644 --- a/Assets/ThirdPlugins/StompyRobot/SRDebugger/Resources/SRDebugger/UI/Prefabs/Trigger.prefab +++ b/Assets/ThirdPlugins/StompyRobot/SRDebugger/Resources/SRDebugger/UI/Prefabs/Trigger.prefab @@ -455,7 +455,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2, y: 2} + m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0, y: 1} --- !u!1 &1467285441891278 GameObject: diff --git a/Assets/ThirdPlugins/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset b/Assets/ThirdPlugins/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset index 24af773a..cebe4ca9 100644 --- a/Assets/ThirdPlugins/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset +++ b/Assets/ThirdPlugins/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset @@ -59,7 +59,7 @@ MonoBehaviour: _profilerAlignment: 2 _optionsAlignment: 3 _consoleAlignment: 0 - _triggerPosition: 1 + _triggerPosition: 5 _maximumConsoleEntries: 1500 _enableEventSystemCreation: 0 _automaticShowCursor: 1