From 846768e49e51b4b7f066fa60815e99526f7e0f65 Mon Sep 17 00:00:00 2001 From: yulong <1838206582@qq.com> Date: Tue, 12 Mar 2024 17:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E7=9B=98=E5=9B=9E=E8=AE=BF=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XFrame/Example/Scripts/Manager/GameMain.cs | 1 + Assets/Temp/Scripts/Judgmentstate.cs | 1 + Assets/Temp/Scripts/Main_interface_Panel.cs | 2 +- Assets/Temp/Scripts/Taskpanel.cs | 1 + Assets/Temp/Scripts/View_Panel2.cs | 16 ++++++++++++---- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Assets/GameAssets/Toolset/XFrame/Example/Scripts/Manager/GameMain.cs b/Assets/GameAssets/Toolset/XFrame/Example/Scripts/Manager/GameMain.cs index 71e9a8ad..c278cca3 100644 --- a/Assets/GameAssets/Toolset/XFrame/Example/Scripts/Manager/GameMain.cs +++ b/Assets/GameAssets/Toolset/XFrame/Example/Scripts/Manager/GameMain.cs @@ -13,6 +13,7 @@ public class GameMain : MonoBehaviour { public static bool model =false; public static bool tiao =true; + public static bool visit = false; private void Start() { GameObject.Find("UIRoot1").SetActive(false); diff --git a/Assets/Temp/Scripts/Judgmentstate.cs b/Assets/Temp/Scripts/Judgmentstate.cs index d3602a64..6463635e 100644 --- a/Assets/Temp/Scripts/Judgmentstate.cs +++ b/Assets/Temp/Scripts/Judgmentstate.cs @@ -31,6 +31,7 @@ public class Judgmentstate : MonoBehaviour fanhui1.onClick.AddListener(() => { GameMain.tiao = false; + GameMain.visit = true; //SceneManager.LoadScene("SampleScene"); OnLeaveRoom(); }); diff --git a/Assets/Temp/Scripts/Main_interface_Panel.cs b/Assets/Temp/Scripts/Main_interface_Panel.cs index 791bee40..2bc3084d 100644 --- a/Assets/Temp/Scripts/Main_interface_Panel.cs +++ b/Assets/Temp/Scripts/Main_interface_Panel.cs @@ -8,7 +8,7 @@ using XFrame.Core.UI; public class Main_interface_Panel : XUIPanel { - public Button fanhui_btn;//返回初始界面 + public static Button fanhui_btn;//返回初始界面 public Button train; public Button replay; public Button appQuet; diff --git a/Assets/Temp/Scripts/Taskpanel.cs b/Assets/Temp/Scripts/Taskpanel.cs index 73e9791a..73782b04 100644 --- a/Assets/Temp/Scripts/Taskpanel.cs +++ b/Assets/Temp/Scripts/Taskpanel.cs @@ -44,6 +44,7 @@ public class Taskpanel : MonoBehaviour fanhui.onClick.AddListener(() => { GameMain.tiao = false; + GameMain.visit = true; OnLeaveRoom(); }); two_dimensional.onClick.AddListener(() => diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs index 1b8458fa..6f3356c4 100644 --- a/Assets/Temp/Scripts/View_Panel2.cs +++ b/Assets/Temp/Scripts/View_Panel2.cs @@ -90,7 +90,9 @@ public class View_Panel2 : XUIPanel public Button entering_key_btn;//进入导调按钮 public Button scenario_btn;//想定编辑 public Button refresh_btn;//刷新房间按钮 - + public Button playback_btn;//复盘回访按钮 + + public View_Panel2() : base(UIType.Normal, UIMode.HideOther, UICollider.Normal) { uiPath = "UIPanel/View_Panel2"; @@ -114,7 +116,7 @@ public class View_Panel2 : XUIPanel off3_btn = GameObject.Find("View_Panel2(Clone)").transform.GetChild(4).transform.GetChild(1).GetComponent