From 0eb3599a46587e09584f1904ebf0c29ad869aa9e Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 17 Nov 2023 12:35:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SCRIPTS/TenkokuModule.cs | 10 +++++----- Assets/Temp/Scripts/Jsonanalyze.cs | 1 - Assets/Temp/Scripts/View_Panel2.cs | 5 ++++- .../AdamTraining_pilot_terminal_panl 1.unity | 17 ++++++++++------- Assets/Zion/Scripts/Adam/GameManager.cs | 13 +++++++++---- Assets/Zion/Scripts/Adam/UIBootstrap.cs | 2 +- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/SCRIPTS/TenkokuModule.cs b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/SCRIPTS/TenkokuModule.cs index 4556b476..290c01a6 100644 --- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/SCRIPTS/TenkokuModule.cs +++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/SCRIPTS/TenkokuModule.cs @@ -818,11 +818,11 @@ namespace Tenkoku.Core void Awake(){ //GET CAMERA OBJECT - if (Application.isPlaying){ - if (mainCamera == null){ - mainCamera = Camera.main.transform; - } - } + //if (Application.isPlaying){ + // if (mainCamera == null){ + // mainCamera = Camera.main.transform; + // } + //} //set custom random generator instance randSeed = System.Environment.TickCount; diff --git a/Assets/Temp/Scripts/Jsonanalyze.cs b/Assets/Temp/Scripts/Jsonanalyze.cs index 577adcd1..01470f35 100644 --- a/Assets/Temp/Scripts/Jsonanalyze.cs +++ b/Assets/Temp/Scripts/Jsonanalyze.cs @@ -19,7 +19,6 @@ public class Jsonanalyze : MonoBehaviour // str = str.Replace("\\n", "\n"); // str = str.Replace(" ", ""); // str = str.Replace("\t", ""); - Debug.Log($"str==={str}"); if (str.Length > 2) { if (str[0] == '"') diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs index 8e0d6aa7..7e3c904f 100644 --- a/Assets/Temp/Scripts/View_Panel2.cs +++ b/Assets/Temp/Scripts/View_Panel2.cs @@ -582,7 +582,10 @@ public class View_Panel2 : XUIPanel CreateSubjectInfo(currentSubjectInfo.data); }); } - currentRoomSubjectItemConnect.GetChild(1).GetComponent