diff --git a/3d/Assets/3rdParty/UIEffect-upm/Scripts/Common/EffectPlayer.cs b/3d/Assets/3rdParty/UIEffect-upm/Scripts/Common/EffectPlayer.cs index 927e4ab..9e0d56f 100644 --- a/3d/Assets/3rdParty/UIEffect-upm/Scripts/Common/EffectPlayer.cs +++ b/3d/Assets/3rdParty/UIEffect-upm/Scripts/Common/EffectPlayer.cs @@ -95,10 +95,10 @@ namespace Coffee.UIEffects /// public void Play(bool reset, Action callback = null) { - if (reset) - { + + _time = 0; - } + play = true; if (callback != null) diff --git a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendar.cs b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendar.cs index d430d66..32614d9 100644 --- a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendar.cs +++ b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendar.cs @@ -49,10 +49,10 @@ namespace ZTools }; zCalendarController.Init(); // ����ʱ�Զ���ʼ�� - if (zCalendarModel.awake2Init) - { + + Init(); - } + } /// /// ��������ʱ���ʼ�� diff --git a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs index e190ff3..a2b9043 100644 --- a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs +++ b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs @@ -22,8 +22,8 @@ namespace ZTools public bool isPopupCalendar = false; [Header("当前是否为静态日历")] public bool isStaticCalendar = false; - [Header("自动修改日期尺寸")] - public bool autoSetItemSize = true; + + [Header("是否可以选择时间范围")] public bool rangeCalendar = false; [Header("--------------------------------------------------------------------")] @@ -50,10 +50,10 @@ namespace ZTools bak.SetActive(true); this.GetComponent().Hide(); } - if (autoSetItemSize) - { + + SetItemSize(); - } + if (isPopupCalendar) { AddCloseBtn(); diff --git a/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Player.cs b/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Player.cs index c9d3287..4cd0b72 100644 --- a/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Player.cs +++ b/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Player.cs @@ -444,8 +444,8 @@ namespace RenderHeads.Media.AVProVideo.Editor IMediaControl control = mediaPlayer.Control; bool showBrowseMenu = false; - if (true) - { + + bool isPlaying = false; if (control != null) { @@ -649,7 +649,7 @@ namespace RenderHeads.Media.AVProVideo.Editor } EditorGUILayout.EndHorizontal(); - } + EditorGUILayout.EndVertical(); if (showBrowseMenu) diff --git a/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer.cs b/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer.cs index 403fee4..ac62402 100644 --- a/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer.cs +++ b/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer.cs @@ -1361,11 +1361,11 @@ namespace RenderHeads.Media.AVProVideo #endif #endif // Fallback - if (mediaPlayer == null) - { + + Debug.LogError(string.Format("[AVProVideo] Not supported on this platform {0} {1} {2} {3}. Using null media player!", Application.platform, SystemInfo.deviceModel, SystemInfo.processorType, SystemInfo.operatingSystem)); mediaPlayer = CreateMediaPlayerNull(); - } + return mediaPlayer; } diff --git a/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_Events.cs b/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_Events.cs index 0fa3d4f..9caa9f3 100644 --- a/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_Events.cs +++ b/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_Events.cs @@ -107,11 +107,11 @@ namespace RenderHeads.Media.AVProVideo } } #endif - if (reset) - { + + //Debug.Log("Reset"); _eventFired_FinishedPlaying = false; - } + } } diff --git a/3d/Assets/Framework/Manager/TutorialGuideManager.cs b/3d/Assets/Framework/Manager/TutorialGuideManager.cs index bc98c18..e8390b8 100644 --- a/3d/Assets/Framework/Manager/TutorialGuideManager.cs +++ b/3d/Assets/Framework/Manager/TutorialGuideManager.cs @@ -412,8 +412,8 @@ namespace Framework.Manager if (uiObjects.TryGetValue(currentStep.uiObjectName, out GameObject uiObject)) { // 如果启用了UI状态检测，需要检查UI是否完全显示 - //if (enableUIStateCheck) - //{ + + if (IsUIObjectFullyDisplayed(uiObject)) { Debug.Log($"执行引导步骤: {currentStep.stepName} 查询的对象：{uiObject.name}"); @@ -428,14 +428,14 @@ namespace Framework.Manager bool delayedResult = await DelayedFindUIObjectAsync(currentStep); return delayedResult; } - //} - //else - //{ - // Debug.Log($"执行引导步骤: {currentStep.stepName} 查询的对象：{uiObject.name}"); - // GuideMask.Instance.CreateRectangleMask(uiObject); - // // 如果UI对象是InputField，自动聚焦到该输入框 - // FocusInputFieldIfApplicable(uiObject); - //} + + + + + + + + return true; } else diff --git a/3d/Assets/Framework/Scripts/Runtime/Engine/Engine.Console/DeveloperConsole.cs b/3d/Assets/Framework/Scripts/Runtime/Engine/Engine.Console/DeveloperConsole.cs index 35e96a7..4617469 100644 --- a/3d/Assets/Framework/Scripts/Runtime/Engine/Engine.Console/DeveloperConsole.cs +++ b/3d/Assets/Framework/Scripts/Runtime/Engine/Engine.Console/DeveloperConsole.cs @@ -50,13 +50,10 @@ namespace MotionFramework.Console /// 扩展的控制台窗口所在的程序集 public static void Initialize(bool showFPS = true, string assemblyName = AssemblyUtility.UnityDefaultAssemblyName) { - if (showFPS) - { - _fpsCounter = new FPSCounter(); - } + _fpsCounter = new FPSCounter(); - // 加载背景纹理 - string textureName = "console_background"; + // 加载背景纹理 + string textureName = "console_background"; _bgTexture = Resources.Load(textureName); if (_bgTexture == null) UnityEngine.Debug.LogWarning($"Not found {textureName} texture in Resources folder."); diff --git a/3d/Assets/Plugins/Standard Assets/Characters/FirstPersonCharacter/Scripts/MouseLook.cs b/3d/Assets/Plugins/Standard Assets/Characters/FirstPersonCharacter/Scripts/MouseLook.cs index 79c3aa2..5231d51 100644 --- a/3d/Assets/Plugins/Standard Assets/Characters/FirstPersonCharacter/Scripts/MouseLook.cs +++ b/3d/Assets/Plugins/Standard Assets/Characters/FirstPersonCharacter/Scripts/MouseLook.cs @@ -36,7 +36,7 @@ namespace UnityStandardAssets.Characters.FirstPerson m_CharacterTargetRot *= Quaternion.Euler (0f, yRot, 0f); m_CameraTargetRot *= Quaternion.Euler (-xRot, 0f, 0f); - if(clampVerticalRotation) + m_CameraTargetRot = ClampRotationAroundXAxis (m_CameraTargetRot); if(smooth)