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

2.0005

This commit is contained in:
wangzhixun 2025-11-04 21:45:34 +08:00
parent 9c6a653b91
commit 7df0bf4b6f
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,9 +204,9 @@ namespace HighlightPlus {
void SwitchesCollider (Transform newObject) { void SwitchesCollider (Transform newObject) {
if (currentEffect != null) { if (currentEffect != null) {
if (highlightOnHover) {
Highlight(false);
}
currentEffect = null; currentEffect = null;
} }
currentObject = newObject; currentObject = newObject;
@ -222,7 +222,7 @@ namespace HighlightPlus {
if (parentEffect != null && parentEffect.Includes(newObject)) { if (parentEffect != null && parentEffect.Includes(newObject)) {
currentEffect = parentEffect; currentEffect = parentEffect;
Highlight(true);
return; return;
} }
@ -232,7 +232,7 @@ namespace HighlightPlus {
currentEffect.SetTarget(currentObject); currentEffect.SetTarget(currentObject);
Highlight(true);
} }

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

@ -44,10 +44,10 @@ namespace ZTools
{ {
zCalendarController.ChangeRangeType(this); zCalendarController.ChangeRangeType(this);
} }
//if (zCalendarController.zCalendarModel.isPopupCalendar && zCalendarController.isInit)
//{
// zCalendarController.Hide();
//}
} }
} }
} }

6
3d/Assets/AVProVideo/Demos/Common/LookAround360.cs
View File

@ -91,10 +91,10 @@ namespace RenderHeads.Media.AVProVideo.Demos
{ {
float h = _maxSpinSpeed * -Input.GetAxis("Mouse X") * Time.deltaTime; float h = _maxSpinSpeed * -Input.GetAxis("Mouse X") * Time.deltaTime;
float v = 0f; float v = 0f;
if (!_lockPitch)
{
v = _maxSpinSpeed * Input.GetAxis("Mouse Y") * Time.deltaTime; v = _maxSpinSpeed * Input.GetAxis("Mouse Y") * Time.deltaTime;
}
h = Mathf.Clamp(h, -0.5f, 0.5f); h = Mathf.Clamp(h, -0.5f, 0.5f);
v = Mathf.Clamp(v, -0.5f, 0.5f); v = Mathf.Clamp(v, -0.5f, 0.5f);
_spinX += h; _spinX += h;

12
3d/Assets/AVProVideo/Editor/Scripts/EditorHelper.cs
View File

@ -344,14 +344,14 @@ namespace RenderHeads.Media.AVProVideo.Editor
{ {
GUILayout.BeginHorizontal(); GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace(); GUILayout.FlexibleSpace();
if (style == null) if (style != null)
{ {
GUILayout.Label(text); GUILayout.Label(text, style);
} }
else else
{ {
GUILayout.Label(text, style); GUILayout.Label(text);
} }
GUILayout.FlexibleSpace(); GUILayout.FlexibleSpace();
GUILayout.EndHorizontal(); GUILayout.EndHorizontal();
} }

2
3d/Assets/AVProVideo/Extensions/UnityUI/Runtime/SubtitlesUGUI.cs
View File

@ -77,7 +77,7 @@ namespace RenderHeads.Media.AVProVideo
private string PrepareText(string text) private string PrepareText(string text)
{ {
// Crop text that is too long // Crop text that is too long
if (_maxCharacters >= 0 && text.Length > _maxCharacters) if (text.Length > _maxCharacters)
{ {
text = text.Substring(0, _maxCharacters); text = text.Substring(0, _maxCharacters);
} }

2
3d/Assets/AVProVideo/Runtime/Scripts/Components/DisplayIMGUI.cs
View File

@ -122,7 +122,7 @@ namespace RenderHeads.Media.AVProVideo
{ {
Shader result = null; Shader result = null;
if (result == null && _mediaPlayer.TextureProducer != null) if (_mediaPlayer.TextureProducer != null)
{ {
switch (_mediaPlayer.TextureProducer.GetTextureAlphaPacking()) switch (_mediaPlayer.TextureProducer.GetTextureAlphaPacking())
{ {

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

@ -113,7 +113,7 @@ namespace UnityStandardAssets.Vehicles.Car
{ {
// for 1 channel engine sound, it's oh so simple: // for 1 channel engine sound, it's oh so simple:
m_HighAccel.pitch = pitch*pitchMultiplier*highPitchMultiplier; m_HighAccel.pitch = pitch*pitchMultiplier*highPitchMultiplier;
m_HighAccel.dopplerLevel = useDoppler ? dopplerLevel : 0; m_HighAccel.dopplerLevel = dopplerLevel;
m_HighAccel.volume = 1; m_HighAccel.volume = 1;
} }
else else

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

@ -17,7 +17,7 @@ public class DragWindow : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDr
//刚开始拖拽时第一下触发这个函数 //刚开始拖拽时第一下触发这个函数
public void OnBeginDrag(PointerEventData eventData) public void OnBeginDrag(PointerEventData eventData)
{ {
if (!IgnoretheUI)
if (EventSystem.current.IsPointerOverGameObject()) return; if (EventSystem.current.IsPointerOverGameObject()) return;
if (RectTransformUtility.RectangleContainsScreenPoint(transform as RectTransform, Input.mousePosition)) if (RectTransformUtility.RectangleContainsScreenPoint(transform as RectTransform, Input.mousePosition))
{ {