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

4.0002

This commit is contained in:
wangzhixun 2025-11-04 23:12:52 +08:00
parent 1fb88e42be
commit c4773e0eee
5 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,13 +58,13 @@ namespace ZTools
AddCloseBtn(); AddCloseBtn();
if (isStaticCalendar)
{
btnLastYear.gameObject.SetActive(false); btnLastYear.gameObject.SetActive(false);
btnNextYear.gameObject.SetActive(false); btnNextYear.gameObject.SetActive(false);
btnLastMonth.gameObject.SetActive(false); btnLastMonth.gameObject.SetActive(false);
btnNextMonth.gameObject.SetActive(false); btnNextMonth.gameObject.SetActive(false);
}
} }
/// <summary> /// <summary>
/// 生成一个日期对象 /// 生成一个日期对象

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

@ -400,14 +400,14 @@ namespace Framework.Manager
if (currentIndex < orderedSteps.Count) if (currentIndex < orderedSteps.Count)
{ {
var currentStep = orderedSteps[currentIndex]; var currentStep = orderedSteps[currentIndex];
if (currentStep.isOpenUI)
{
// UIButton.SetActive(true);
}
else
{
UIButton.SetActive(false); UIButton.SetActive(false);
}
if (uiObjects.TryGetValue(currentStep.uiObjectName, out GameObject uiObject)) if (uiObjects.TryGetValue(currentStep.uiObjectName, out GameObject uiObject))
{ {
@ -504,14 +504,14 @@ namespace Framework.Manager
} }
} }
if (currentStep.isOpenUI)
{
// UIButton.SetActive(true);
}
else
{
UIButton.SetActive(false); UIButton.SetActive(false);
}
return true; return true;
} }
else else

9
3d/Assets/Plugins/Standard Assets/Utility/TimedObjectDestructor.cs
View File

@ -15,13 +15,6 @@ namespace UnityStandardAssets.Utility
} }
private void DestroyNow()
{
if (m_DetachChildren)
{
transform.DetachChildren();
}
DestroyObject(gameObject);
}
} }
} }

2
3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs
View File

@ -216,7 +216,7 @@ namespace Cysharp.Threading.Tasks.Internal
} }
finally finally
{ {
if (lockTaken) gate.Exit(false); gate.Exit(false);
} }
} }
} }

4
3d/Assets/Plugins/UniTask/Runtime/UniTaskSynchronizationContext.cs
View File

@ -97,7 +97,7 @@ namespace Cysharp.Threading.Tasks
} }
finally finally
{ {
if (lockTaken) gate.Exit(false); gate.Exit(false);
} }
} }
@ -125,7 +125,7 @@ namespace Cysharp.Threading.Tasks
} }
finally finally
{ {
if (lockTaken) gate.Exit(false); gate.Exit(false);
} }
} }
} }