From dc780717c3f09c01c4278e1f56938e1b6caaf007 Mon Sep 17 00:00:00 2001 From: huyulong <1838407198@qq.com> Date: Tue, 24 Dec 2024 19:04:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=BA=E6=99=AF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scenes/scheduled_exercise.unity | 79 ++++++++++++++++++- .../Script/UI/PanelUI/SelectScenePanel.cs | 2 + .../Script/scheduled_excercise/LoadScene.cs | 2 +- 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/xiaofang/Assets/Scenes/scheduled_exercise.unity b/xiaofang/Assets/Scenes/scheduled_exercise.unity index 6616e2ff..e99b6f50 100644 --- a/xiaofang/Assets/Scenes/scheduled_exercise.unity +++ b/xiaofang/Assets/Scenes/scheduled_exercise.unity @@ -417,7 +417,7 @@ RectTransform: - {fileID: 892985433} - {fileID: 227942334} m_Father: {fileID: 1449898028} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -646,6 +646,82 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &655716454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 655716455} + - component: {fileID: 655716457} + - component: {fileID: 655716456} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &655716455 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655716454} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1449898028} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &655716456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655716454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d04e5f293a8bded4e9e7a61774178a92, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &655716457 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655716454} + m_CullTransparentMesh: 1 --- !u!1 &681447375 GameObject: m_ObjectHideFlags: 0 @@ -1184,6 +1260,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 655716455} - {fileID: 252707971} m_Father: {fileID: 0} m_RootOrder: 2 diff --git a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs index 1b3f2015..fc8d5fc7 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs @@ -4,6 +4,7 @@ using System.Linq; using TMPro; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.SceneManagement; using UnityEngine.UI; using static Unity.VisualScripting.FlowStateWidget; @@ -481,6 +482,7 @@ public class SelectScenePanel : Base else { transform.gameObject.SetActive(false); + SceneManager.LoadScene(1); } } } diff --git a/xiaofang/Assets/Script/scheduled_excercise/LoadScene.cs b/xiaofang/Assets/Script/scheduled_excercise/LoadScene.cs index 1e35ee7e..a4d941cf 100644 --- a/xiaofang/Assets/Script/scheduled_excercise/LoadScene.cs +++ b/xiaofang/Assets/Script/scheduled_excercise/LoadScene.cs @@ -33,6 +33,6 @@ public class LoadScene : MonoBehaviour public void OnClickNextBtn() { - SceneManager.LoadScene(2); + SceneManager.LoadScene(3); } }