From 6b407ddc0ab18868d516034e63a13fe978257800 Mon Sep 17 00:00:00 2001 From: HJD <491790022@qq.com> Date: Mon, 19 Jun 2023 17:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/GaoSuXunJian/Level2.unity | 62 +++++++++++------------ Assets/Scenes/GaoSuXunJian/Level3.unity | 10 ++-- Assets/Scripts/Manager/Level4lManager.cs | 2 +- Assets/Scripts/Window/AearInfo.cs | 5 +- Assets/Scripts/Window/MenuWindow.cs | 2 +- ProjectSettings/EditorBuildSettings.asset | 4 +- 6 files changed, 43 insertions(+), 42 deletions(-) diff --git a/Assets/Scenes/GaoSuXunJian/Level2.unity b/Assets/Scenes/GaoSuXunJian/Level2.unity index 65acbb2..86a9748 100644 --- a/Assets/Scenes/GaoSuXunJian/Level2.unity +++ b/Assets/Scenes/GaoSuXunJian/Level2.unity @@ -535,7 +535,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -2679,9 +2679,9 @@ RectTransform: m_Father: {fileID: 672614766} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 33.1, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 66.2, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &92933072 @@ -8733,9 +8733,9 @@ RectTransform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &335361015 MonoBehaviour: @@ -9780,7 +9780,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &360703581 RectTransform: m_ObjectHideFlags: 0 @@ -13437,9 +13437,9 @@ RectTransform: m_Father: {fileID: 672614766} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 118.4332, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 74.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &511573818 @@ -13681,9 +13681,9 @@ RectTransform: m_Father: {fileID: 672614766} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 366.35278, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 72.2, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &519644398 @@ -16144,9 +16144,9 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &624335433 MonoBehaviour: @@ -25892,8 +25892,8 @@ RectTransform: m_Father: {fileID: 1575037833} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.45584288} - m_AnchorMax: {x: 1, y: 0.9999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -26072,9 +26072,9 @@ RectTransform: m_Father: {fileID: 672614766} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.48596, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1019787318 @@ -30806,9 +30806,9 @@ RectTransform: m_Father: {fileID: 672614766} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 277.25958, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 75.92, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1197674585 @@ -45184,9 +45184,9 @@ RectTransform: m_Father: {fileID: 672614766} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 197.46638, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 53.6, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1732463330 @@ -48525,9 +48525,9 @@ RectTransform: m_Father: {fileID: 672614766} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 507.51917, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1848095075 @@ -52634,9 +52634,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2030508273 MonoBehaviour: diff --git a/Assets/Scenes/GaoSuXunJian/Level3.unity b/Assets/Scenes/GaoSuXunJian/Level3.unity index cb15995..7b617cf 100644 --- a/Assets/Scenes/GaoSuXunJian/Level3.unity +++ b/Assets/Scenes/GaoSuXunJian/Level3.unity @@ -3121,8 +3121,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 20.4} - m_SizeDelta: {x: 1219.61, y: 809.7556} + m_AnchoredPosition: {x: 0, y: -282.9} + m_SizeDelta: {x: 832.12, y: 203.08557} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &795680594 MonoBehaviour: @@ -3999,7 +3999,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -347} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 694.4, y: 103.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1160174774 @@ -4015,7 +4015,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -5264,7 +5264,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1660090803 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Manager/Level4lManager.cs b/Assets/Scripts/Manager/Level4lManager.cs index 6af0bc3..8ff5524 100644 --- a/Assets/Scripts/Manager/Level4lManager.cs +++ b/Assets/Scripts/Manager/Level4lManager.cs @@ -71,7 +71,7 @@ public class Level4lManager : MonoSingleton } private void Update() { - if (isAnaly && (EducoderText.text.Contains("Y")|| EducoderText.text.Contains("True"))) + if (isAnaly && (EducoderText.text.Contains("Y")|| EducoderText.text.Contains("True")) || EducoderText.text.Contains("t")) { //RandomStone(); tafang.SetActive(true); diff --git a/Assets/Scripts/Window/AearInfo.cs b/Assets/Scripts/Window/AearInfo.cs index cd58b05..0c55708 100644 --- a/Assets/Scripts/Window/AearInfo.cs +++ b/Assets/Scripts/Window/AearInfo.cs @@ -60,8 +60,9 @@ public class AearInfo : MonoBehaviour public void SetCameraBtn() { - cameraTxt.gameObject.SetActive(false); - cameraBtn.gameObject.SetActive(true); + //cameraTxt.gameObject.SetActive(false); + cameraTxt.text = "已部署"; + //cameraBtn.gameObject.SetActive(true); cameraBtn.onClick.AddListener(() => { }); } diff --git a/Assets/Scripts/Window/MenuWindow.cs b/Assets/Scripts/Window/MenuWindow.cs index eede451..3d88f9d 100644 --- a/Assets/Scripts/Window/MenuWindow.cs +++ b/Assets/Scripts/Window/MenuWindow.cs @@ -81,7 +81,7 @@ public class MenuWindow : WindowBase private void Update() { - if ((tougeText.text.Contains("Y")|| (tougeText.text.Contains("True")) &&CheckResult)) + if ((tougeText.text.Contains("Y")|| (tougeText.text.Contains("T"))|| (tougeText.text.Contains("t")) && CheckResult)) { CheckResult = false; OverTip.SetActive(true); diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c215dfd..420bd58 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,13 +8,13 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/GaoSuXunJian/Level1.unity guid: 88c59328d65b09442aa5853babe30c8e - - enabled: 0 + - enabled: 1 path: Assets/Scenes/GaoSuXunJian/Level2.unity guid: eb1a8fab61180d14da89d8c3edd485b3 - enabled: 0 path: Assets/Scenes/GaoSuXunJian/Level3.unity guid: b613108b3affa9243861689826720d13 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/GaoSuXunJian/Level4.unity guid: 2d2e276980a216941a1fee389e957235 - enabled: 0