huangjiayu
/
Test-TaizhouWarehousePhaseII
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.0006

This commit is contained in:
wangzhixun 2025-11-04 22:24:55 +08:00
parent 693b915b0a
commit bd1d86b54d
9 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3d/Assets/3rdParty/UIEffect-upm/Scripts/Common/EffectPlayer.cs vendored
View File

@ -95,10 +95,10 @@ namespace Coffee.UIEffects
/// </summary> /// </summary>
public void Play(bool reset, Action<float> callback = null) public void Play(bool reset, Action<float> callback = null)
{ {
if (reset)
{
_time = 0; _time = 0;
}
play = true; play = true;
if (callback != null) if (callback != null)

6
3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendar.cs vendored
View File

@ -49,10 +49,10 @@ namespace ZTools
}; };
zCalendarController.Init(); zCalendarController.Init();
// <20><><EFBFBD><EFBFBD>ʱ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>ʼ<EFBFBD><CABC> // <20><><EFBFBD><EFBFBD>ʱ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>ʼ<EFBFBD><CABC>
if (zCalendarModel.awake2Init)
{
Init(); Init();
}
} }
/// <summary> /// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD>ʼ<EFBFBD><CABC> /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD>ʼ<EFBFBD><CABC>

10
3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs vendored
View File

@ -22,8 +22,8 @@ namespace ZTools
public bool isPopupCalendar = false; public bool isPopupCalendar = false;
[Header("当前是否为静态日历")] [Header("当前是否为静态日历")]
public bool isStaticCalendar = false; public bool isStaticCalendar = false;
[Header("自动修改日期尺寸")]
public bool autoSetItemSize = true;
[Header("是否可以选择时间范围")] [Header("是否可以选择时间范围")]
public bool rangeCalendar = false; public bool rangeCalendar = false;
[Header("--------------------------------------------------------------------")] [Header("--------------------------------------------------------------------")]
@ -50,10 +50,10 @@ namespace ZTools
bak.SetActive(true); bak.SetActive(true);
this.GetComponent<ZCalendar>().Hide(); this.GetComponent<ZCalendar>().Hide();
} }
if (autoSetItemSize)
{
SetItemSize(); SetItemSize();
}
if (isPopupCalendar) if (isPopupCalendar)
{ {
AddCloseBtn(); AddCloseBtn();

6
3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Player.cs
View File

@ -444,8 +444,8 @@ namespace RenderHeads.Media.AVProVideo.Editor
IMediaControl control = mediaPlayer.Control; IMediaControl control = mediaPlayer.Control;
bool showBrowseMenu = false; bool showBrowseMenu = false;
if (true)
{
bool isPlaying = false; bool isPlaying = false;
if (control != null) if (control != null)
{ {
@ -649,7 +649,7 @@ namespace RenderHeads.Media.AVProVideo.Editor
} }
EditorGUILayout.EndHorizontal(); EditorGUILayout.EndHorizontal();
}
EditorGUILayout.EndVertical(); EditorGUILayout.EndVertical();
if (showBrowseMenu) if (showBrowseMenu)

6
3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer.cs
View File

@ -1361,11 +1361,11 @@ namespace RenderHeads.Media.AVProVideo
#endif #endif
#endif #endif
// Fallback // 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)); 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(); mediaPlayer = CreateMediaPlayerNull();
}
return mediaPlayer; return mediaPlayer;
} }

6
3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_Events.cs
View File

@ -107,11 +107,11 @@ namespace RenderHeads.Media.AVProVideo
} }
} }
#endif #endif
if (reset)
{
//Debug.Log("Reset"); //Debug.Log("Reset");
_eventFired_FinishedPlaying = false; _eventFired_FinishedPlaying = false;
}
} }
} }

20
3d/Assets/Framework/Manager/TutorialGuideManager.cs
View File

@ -412,8 +412,8 @@ namespace Framework.Manager
if (uiObjects.TryGetValue(currentStep.uiObjectName, out GameObject uiObject)) if (uiObjects.TryGetValue(currentStep.uiObjectName, out GameObject uiObject))
{ {
// 如果启用了UI状态检测，需要检查UI是否完全显示 // 如果启用了UI状态检测，需要检查UI是否完全显示
//if (enableUIStateCheck)
//{
if (IsUIObjectFullyDisplayed(uiObject)) if (IsUIObjectFullyDisplayed(uiObject))
{ {
Debug.Log($"执行引导步骤: {currentStep.stepName} 查询的对象：{uiObject.name}"); Debug.Log($"执行引导步骤: {currentStep.stepName} 查询的对象：{uiObject.name}");
@ -428,14 +428,14 @@ namespace Framework.Manager
bool delayedResult = await DelayedFindUIObjectAsync(currentStep); bool delayedResult = await DelayedFindUIObjectAsync(currentStep);
return delayedResult; return delayedResult;
} }
//}
//else
//{
// Debug.Log($"执行引导步骤: {currentStep.stepName} 查询的对象：{uiObject.name}");
// GuideMask.Instance.CreateRectangleMask(uiObject);
// // 如果UI对象是InputField，自动聚焦到该输入框
// FocusInputFieldIfApplicable(uiObject);
//}
return true; return true;
} }
else else

3
3d/Assets/Framework/Scripts/Runtime/Engine/Engine.Console/DeveloperConsole.cs
View File

@ -49,11 +49,8 @@ namespace MotionFramework.Console
/// </summary> /// </summary>
/// <param name="assemblyName">扩展的控制台窗口所在的程序集</param> /// <param name="assemblyName">扩展的控制台窗口所在的程序集</param>
public static void Initialize(bool showFPS = true, string assemblyName = AssemblyUtility.UnityDefaultAssemblyName) 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";

2
3d/Assets/Plugins/Standard Assets/Characters/FirstPersonCharacter/Scripts/MouseLook.cs
View File

@ -36,7 +36,7 @@ namespace UnityStandardAssets.Characters.FirstPerson
m_CharacterTargetRot *= Quaternion.Euler (0f, yRot, 0f); m_CharacterTargetRot *= Quaternion.Euler (0f, yRot, 0f);
m_CameraTargetRot *= Quaternion.Euler (-xRot, 0f, 0f); m_CameraTargetRot *= Quaternion.Euler (-xRot, 0f, 0f);
if(clampVerticalRotation)
m_CameraTargetRot = ClampRotationAroundXAxis (m_CameraTargetRot); m_CameraTargetRot = ClampRotationAroundXAxis (m_CameraTargetRot);
if(smooth) if(smooth)