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

2.0002

This commit is contained in:
王志勋 2025-11-04 20:05:19 +08:00
parent 7f0217d2d3
commit 8564b999ac
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightManager.cs vendored
View File

@ -221,9 +221,9 @@ namespace HighlightPlus {
HighlightEffect parentEffect = newObject.GetComponentInParent<HighlightEffect>(); HighlightEffect parentEffect = newObject.GetComponentInParent<HighlightEffect>();
if (parentEffect != null && parentEffect.Includes(newObject)) { if (parentEffect != null && parentEffect.Includes(newObject)) {
currentEffect = parentEffect; currentEffect = parentEffect;
if (highlightOnHover) {
Highlight(true); Highlight(true);
}
return; return;
} }
} }

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

@ -257,22 +257,22 @@ namespace ZTools
{ {
monthFirstDay = new DateTime(Year, Month, 1); monthFirstDay = new DateTime(Year, Month, 1);
lastMonthEmptyDays = GetLastMonthDays(); lastMonthEmptyDays = GetLastMonthDays();
if (zCalendarModel.autoFillDate)
{
for (int i = lastMonthEmptyDays; i > 0; i--) for (int i = lastMonthEmptyDays; i > 0; i--)
{ {
AddDayItem(monthFirstDay.AddDays(-i)); AddDayItem(monthFirstDay.AddDays(-i));
} }
}
else
{
for (int i = 0; i < lastMonthEmptyDays; i++)
{
ZCalendarDayItem dayItem = zCalendarModel.Instantiate();
dayItem.zCalendarController = this;
dayItem.CloseClickAble();
}
}
} }
/// <summary> /// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8>µ<EFBFBD>ʱ<EFBFBD><CAB1> /// <20><><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8>µ<EFBFBD>ʱ<EFBFBD><CAB1>
@ -282,14 +282,14 @@ namespace ZTools
int nextMonthDays = 42 - (lastMonthEmptyDays + days); int nextMonthDays = 42 - (lastMonthEmptyDays + days);
if (nextMonthDays != 0) if (nextMonthDays != 0)
{ {
if (zCalendarModel.autoFillDate)
{
DateTime lastDay = monthFirstDay.AddDays(days); DateTime lastDay = monthFirstDay.AddDays(days);
for (int i = 0; i < nextMonthDays; i++) for (int i = 0; i < nextMonthDays; i++)
{ {
AddDayItem(lastDay.AddDays(i)); AddDayItem(lastDay.AddDays(i));
} }
}
} }
} }
/// <summary> /// <summary>

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

@ -282,10 +282,10 @@ namespace RenderHeads.Media.AVProVideo
{ {
// Pause the previously playing video // Pause the previously playing video
// This is useful for systems that will struggle to play 2 videos at once // This is useful for systems that will struggle to play 2 videos at once
if (_pausePreviousOnTransition)
{
CurrentPlayer.Pause(); CurrentPlayer.Pause();
}
// Tell listeners that the playlist item has changed // Tell listeners that the playlist item has changed
Events.Invoke(this, MediaPlayerEvent.EventType.PlaylistItemChanged, ErrorCode.None); Events.Invoke(this, MediaPlayerEvent.EventType.PlaylistItemChanged, ErrorCode.None);

6
3d/Assets/Framework/Scripts/Runtime/Engine/Engine.Camera/CameraControl/CameraControlComponent.cs
View File

@ -131,13 +131,13 @@ namespace Framework.Scripts.Runtime.Engine.Engine.Camera.CameraControl
public void ControlCamera() public void ControlCamera()
{ {
if (enableMouseOverUI)
{
if (EventSystem.current.IsPointerOverGameObject()) if (EventSystem.current.IsPointerOverGameObject())
{ {
return; return;
} }
}
if (enableMouseFunctions) if (enableMouseFunctions)
{ {

6
3d/Assets/Scripts/AutoHideScript.cs
View File

@ -70,11 +70,11 @@ public class AutoHideScript : MonoBehaviour
canvasGroup.alpha = alpha; canvasGroup.alpha = alpha;
// 根据透明度设置交互状态 // 根据透明度设置交互状态
if (disableInteractionWhenHidden)
{
canvasGroup.interactable = alpha > 0.1f; canvasGroup.interactable = alpha > 0.1f;
canvasGroup.blocksRaycasts = alpha > 0.1f; canvasGroup.blocksRaycasts = alpha > 0.1f;
}
} }
} }