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

2.0004

This commit is contained in:
王志勋 2025-11-04 20:57:21 +08:00
parent 5551a323fe
commit 95db87e1bd
6 changed files with 29 additions and 29 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

@ -231,9 +231,9 @@ namespace HighlightPlus {
baseEffect.enabled = currentEffect == baseEffect; baseEffect.enabled = currentEffect == baseEffect;
currentEffect.SetTarget(currentObject); currentEffect.SetTarget(currentObject);
if (highlightOnHover) {
Highlight(true); Highlight(true);
}
} }

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

@ -118,15 +118,15 @@ namespace ZTools
} }
if (!zCalendarController.zCalendarModel.isUnexpiredTimeCanClick) if (!zCalendarController.zCalendarModel.isUnexpiredTimeCanClick)
IsUnexpiredTime(zCalendarController.nowTime, dateTime); IsUnexpiredTime(zCalendarController.nowTime, dateTime);
if (zCalendarController.zCalendarModel.autoFillDate)
{
IsCrtMonth(zCalendarController.Month); IsCrtMonth(zCalendarController.Month);
}
if (zCalendarController.zCalendarModel.lunar)
{
lunarTxt.gameObject.SetActive(true); lunarTxt.gameObject.SetActive(true);
SolarToLunar(dateTime); SolarToLunar(dateTime);
}
} }
/// <summary> /// <summary>
/// 关闭可点击权限 /// 关闭可点击权限

8
3d/Assets/Framework/Scripts/Runtime/Engine/Core/MotionEngine.cs
View File

@ -144,12 +144,12 @@ namespace MotionFramework
if (Contains(typeof(T))) if (Contains(typeof(T)))
throw new Exception($"Game module {typeof(T)} is already existed"); throw new Exception($"Game module {typeof(T)} is already existed");
// 如果没有设置优先级
if (priority == 0)
{
int minPriority = GetMinPriority(); int minPriority = GetMinPriority();
priority = --minPriority; priority = --minPriority;
}
MotionLog.Log($"Create game module : {typeof(T)}"); MotionLog.Log($"Create game module : {typeof(T)}");
T module = Activator.CreateInstance<T>(); T module = Activator.CreateInstance<T>();

22
3d/Assets/Plugins/Standard Assets/Utility/SimpleMouseRotator.cs
View File

@ -43,8 +43,8 @@ namespace UnityStandardAssets.Utility
// read input from mouse or mobile controls // read input from mouse or mobile controls
float inputH; float inputH;
float inputV; float inputV;
if (relative)
{
inputH = CrossPlatformInputManager.GetAxis("Mouse X"); inputH = CrossPlatformInputManager.GetAxis("Mouse X");
inputV = CrossPlatformInputManager.GetAxis("Mouse Y"); inputV = CrossPlatformInputManager.GetAxis("Mouse Y");
@ -92,16 +92,16 @@ namespace UnityStandardAssets.Utility
// clamp values to allowed range // clamp values to allowed range
m_TargetAngles.y = Mathf.Clamp(m_TargetAngles.y, -rotationRange.y*0.5f, rotationRange.y*0.5f); m_TargetAngles.y = Mathf.Clamp(m_TargetAngles.y, -rotationRange.y*0.5f, rotationRange.y*0.5f);
m_TargetAngles.x = Mathf.Clamp(m_TargetAngles.x, -rotationRange.x*0.5f, rotationRange.x*0.5f); m_TargetAngles.x = Mathf.Clamp(m_TargetAngles.x, -rotationRange.x*0.5f, rotationRange.x*0.5f);
}
else
{
inputH = Input.mousePosition.x;
inputV = Input.mousePosition.y;
// set values to allowed range
m_TargetAngles.y = Mathf.Lerp(-rotationRange.y*0.5f, rotationRange.y*0.5f, inputH/Screen.width);
m_TargetAngles.x = Mathf.Lerp(-rotationRange.x*0.5f, rotationRange.x*0.5f, inputV/Screen.height);
}
// smoothly interpolate current values to target angles // smoothly interpolate current values to target angles
m_FollowAngles = Vector3.SmoothDamp(m_FollowAngles, m_TargetAngles, ref m_FollowVelocity, dampingTime); m_FollowAngles = Vector3.SmoothDamp(m_FollowAngles, m_TargetAngles, ref m_FollowVelocity, dampingTime);

8
3d/Assets/Plugins/Standard Assets/Vehicles/Car/Scripts/CarAudio.cs
View File

@ -147,10 +147,10 @@ namespace UnityStandardAssets.Vehicles.Car
m_HighDecel.volume = highFade*decFade; m_HighDecel.volume = highFade*decFade;
// adjust the doppler levels // adjust the doppler levels
m_HighAccel.dopplerLevel = useDoppler ? dopplerLevel : 0; m_HighAccel.dopplerLevel = 1;
m_LowAccel.dopplerLevel = useDoppler ? dopplerLevel : 0; m_LowAccel.dopplerLevel = 1;
m_HighDecel.dopplerLevel = useDoppler ? dopplerLevel : 0; m_HighDecel.dopplerLevel = 1;
m_LowDecel.dopplerLevel = useDoppler ? dopplerLevel : 0; m_LowDecel.dopplerLevel = 1;
} }
} }
} }

4
3d/Assets/Zion/Scripts/Utility/DragWindow.cs
View File

@ -53,8 +53,8 @@ public class DragWindow : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDr
//停止拖拽 //停止拖拽
public void OnEndDrag(PointerEventData eventData) public void OnEndDrag(PointerEventData eventData)
{ {
if (!IgnoretheUI)
if (EventSystem.current.IsPointerOverGameObject()) return; if (EventSystem.current.IsPointerOverGameObject()) return;
CanDrag = false; CanDrag = false;
if (isFirstDrag && transform.Find("tip")) if (isFirstDrag && transform.Find("tip"))
{ {