From d76edf84957e1ab1f68d7e150a57ba1878d2f10d Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Fri, 24 Nov 2023 19:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=81=E5=8A=BF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=91=98=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89player?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Temp/Scripts/View_Panel2.cs            |  2 +-
 .../AdamTraining_pilot_terminal_panl 1.unity  | 39 ++++++++++++++++++-
 Assets/Zion/Scripts/Adam/GameManager.cs       |  3 +-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs
index 3ff00ae9..d05bfc6e 100644
--- a/Assets/Temp/Scripts/View_Panel2.cs
+++ b/Assets/Temp/Scripts/View_Panel2.cs
@@ -457,7 +457,7 @@ public class View_Panel2 : XUIPanel
             EliminateAccount();
             Debug.Log($"currentSubjectID+currentSeatID={ currentSubjectID }={currentSeatID}");
         });
-        if (GlobalFlag.currentUser.role_code.Equals("04") || GlobalFlag.currentUser.role_code.Equals("05"))
+        if (GlobalFlag.currentUser.role_code.Equals("04") || GlobalFlag.currentUser.role_code.Equals("05") || GlobalFlag.currentUser.role_code.Equals("02"))
         {
             seatTemp.transform.GetChild(3).GetComponent<Button>().interactable = false;
         }
diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
index 103961e0..1d232632 100644
--- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity	
+++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity	
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 1113159741}
-  m_IndirectSpecularColor: {r: 0.16230363, g: 0.30690566, b: 0.6735028, a: 1}
+  m_IndirectSpecularColor: {r: 0.16231084, g: 0.30646205, b: 0.67105705, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -43928,6 +43928,11 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4485532912350568430, guid: e4ab650712d498f468e796b8095875b0,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4485532913520624914, guid: e4ab650712d498f468e796b8095875b0,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -59613,6 +59618,36 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8596415491165714378, guid: c3d92615a09597d46aa740923029c15d,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8596415491165714378, guid: c3d92615a09597d46aa740923029c15d,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8596415491165714378, guid: c3d92615a09597d46aa740923029c15d,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8596415491165714378, guid: c3d92615a09597d46aa740923029c15d,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1862065805184089357}
+    - target: {fileID: 8596415491165714378, guid: c3d92615a09597d46aa740923029c15d,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnLeaveRoom
+      objectReference: {fileID: 0}
+    - target: {fileID: 8596415491165714378, guid: c3d92615a09597d46aa740923029c15d,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     - target: {fileID: 8851741047579415798, guid: c3d92615a09597d46aa740923029c15d,
         type: 3}
       propertyPath: m_AnchorMax.x
@@ -62724,7 +62759,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 28899812
+  randSeed: 35934125
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574
diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs
index 3e68aa7e..c2202611 100644
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@@ -105,7 +105,7 @@ public class GameManager : MonoSingleton<GameManager>
             student.gameObject.SetActive(false);
             spt.GetComponent<Camera>().cullingMask = -1;
         }
-        if (GlobalFlag.currentUser.role_code == "05")
+        if (GlobalFlag.currentUser.role_code == "02")
         {
             Teacher.gameObject.SetActive(false);
             student.gameObject.SetActive(false);
@@ -344,6 +344,7 @@ public class GameManager : MonoSingleton<GameManager>
                         spt.gameObject.transform.position = blueSpawnPos.position;
                         spt.gameObject.transform.eulerAngles = blueSpawnPos.eulerAngles;
                     }
+                    spt.SetPlayerInfo(ulong.Parse(userInfo[0]), userInfo[1], ulong.Parse(userInfo[2]), false);
                     spt.gameObject.SetActive(true);
                     AddPlayers(spt);
                 }