From 5551a323fe2058bb13d1daf22ac33582fa309275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=8B=8B?= <3077614386@qq.com> Date: Tue, 4 Nov 2025 20:48:54 +0800 Subject: [PATCH] 2.0003 --- .../Characters/RollerBall/Scripts/Ball.cs | 16 +++++----- 3d/Assets/Scripts/ProgressBarController.cs | 14 ++++---- 3d/Assets/Zion/Scripts/ModerController.cs | 32 +++++++++---------- 3d/Assets/Zion/Scripts/Utility/DragWindow.cs | 4 +-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/3d/Assets/Plugins/Standard Assets/Characters/RollerBall/Scripts/Ball.cs b/3d/Assets/Plugins/Standard Assets/Characters/RollerBall/Scripts/Ball.cs index 6d37fbd..ce726fc 100644 --- a/3d/Assets/Plugins/Standard Assets/Characters/RollerBall/Scripts/Ball.cs +++ b/3d/Assets/Plugins/Standard Assets/Characters/RollerBall/Scripts/Ball.cs @@ -25,16 +25,16 @@ namespace UnityStandardAssets.Vehicles.Ball public void Move(Vector3 moveDirection, bool jump) { // If using torque to rotate the ball... - if (m_UseTorque) - { + + // ... add torque around the axis defined by the move direction. m_Rigidbody.AddTorque(new Vector3(moveDirection.z, 0, -moveDirection.x)*m_MovePower); - } - else - { - // Otherwise add force in the move direction. - m_Rigidbody.AddForce(moveDirection*m_MovePower); - } + + + + + + // If on the ground and jump is pressed... if (Physics.Raycast(transform.position, -Vector3.up, k_GroundRayLength) && jump) diff --git a/3d/Assets/Scripts/ProgressBarController.cs b/3d/Assets/Scripts/ProgressBarController.cs index 1a084e0..5003eb7 100644 --- a/3d/Assets/Scripts/ProgressBarController.cs +++ b/3d/Assets/Scripts/ProgressBarController.cs @@ -243,15 +243,15 @@ public class ProgressBarController : MonoBehaviour { if (completionText != null) { - if (showPercentage) - { + + int percentage = Mathf.RoundToInt(progress * 100); completionText.text = $"{progressMessage} {percentage}%"; - } - else - { - completionText.text = $"{progressMessage} 进度: {progress:F2}"; - } + + + + + } } diff --git a/3d/Assets/Zion/Scripts/ModerController.cs b/3d/Assets/Zion/Scripts/ModerController.cs index caf8647..5f43bb6 100644 --- a/3d/Assets/Zion/Scripts/ModerController.cs +++ b/3d/Assets/Zion/Scripts/ModerController.cs @@ -1942,8 +1942,8 @@ public class ModerController : MonoBehaviour return false; } - if (active) - { + + // 随机选择一个损坏模型变体 int randomIndex = Random.Range(0, existingBrokenModels.Count); string selectedBrokenModel = existingBrokenModels[randomIndex]; @@ -1968,20 +1968,20 @@ public class ModerController : MonoBehaviour } } } - } - else - { - // 关闭所有损坏模型 - foreach (string modelName in existingBrokenModels) - { - Transform child = parent.Find(modelName); - if (child != null) - { - child.gameObject.SetActive(false); - } - } - Debug.Log($"关闭所有损坏模型,基础模型: {baseModelName}"); - } + + + + + + + + + + + + + + return true; } diff --git a/3d/Assets/Zion/Scripts/Utility/DragWindow.cs b/3d/Assets/Zion/Scripts/Utility/DragWindow.cs index f58d56d..05cdd80 100644 --- a/3d/Assets/Zion/Scripts/Utility/DragWindow.cs +++ b/3d/Assets/Zion/Scripts/Utility/DragWindow.cs @@ -38,8 +38,8 @@ public class DragWindow : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDr } public void OnDrag(PointerEventData eventData) { - if (!IgnoretheUI) - if (EventSystem.current.IsPointerOverGameObject()) return; + + if (EventSystem.current.IsPointerOverGameObject()) return; if (CanDrag) { Vector2 localPosition;