diff --git a/Assets/Temp/Scripts/Devicemovement.cs b/Assets/Temp/Scripts/Devicemovement.cs index 550c1534..e1ba5c01 100644 --- a/Assets/Temp/Scripts/Devicemovement.cs +++ b/Assets/Temp/Scripts/Devicemovement.cs @@ -31,6 +31,7 @@ public class Devicemovement : MonoBehaviour void Update() { + if (UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject()) return; if (Input.GetMouseButtonDown(2)) { Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); diff --git a/Assets/Temp/Scripts/Judgmentstate.cs b/Assets/Temp/Scripts/Judgmentstate.cs index c028d0ab..438c0200 100644 --- a/Assets/Temp/Scripts/Judgmentstate.cs +++ b/Assets/Temp/Scripts/Judgmentstate.cs @@ -23,13 +23,13 @@ public class Judgmentstate : MonoBehaviour public Button initiate_botn;//开始推演按钮 public Button finish_bton;//结束按钮 - + public Text textname;//显示账号文本 void Start() { - + textname.text = GlobalFlag.currentUser.login_name; fanhui1.onClick.AddListener(() => { GameMain.tiao = false; diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index 377e4126..477147cd 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -361,8 +361,13 @@ public class Scenariopage : MonoBehaviour private GameObject caodi;//学校周围的草地 public GameObject shandi;//山地地图 public Camera hipotcamera;//学校相机的位置 + /// + /// 显示登入的账号 + /// + public Text textname; void Start() { + textname.text = GlobalFlag.currentUser.login_name; xuexiao = GameObject.Find("主席台场景"); caodi = GameObject.Find("Background"); diff --git a/Assets/Temp/Scripts/Secondarymovement.cs b/Assets/Temp/Scripts/Secondarymovement.cs index 77af5759..6c6385de 100644 --- a/Assets/Temp/Scripts/Secondarymovement.cs +++ b/Assets/Temp/Scripts/Secondarymovement.cs @@ -35,6 +35,7 @@ public class Secondarymovement : MonoBehaviour } void Update() { + if (UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject()) return; if (Input.GetMouseButtonDown(0)) { Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 13b56c55..fe99a196 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.16234264, g: 0.30609226, b: 0.6688266, a: 1} + m_IndirectSpecularColor: {r: 0.16836634, g: 0.30774426, b: 0.6377365, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -50579,8 +50579,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: 70, y: 0} - m_SizeDelta: {x: 330, y: 120} + m_AnchoredPosition: {x: 90.81, y: 0} + m_SizeDelta: {x: 468.7426, y: 136.66667} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1033366231 MonoBehaviour: @@ -72648,7 +72648,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 433334625 + randSeed: 91672796 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -74732,6 +74732,41 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5855821741443261692, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 92.92 + objectReference: {fileID: 0} + - target: {fileID: 5855821741443261692, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_SizeDelta.x + value: 506.17548 + objectReference: {fileID: 0} + - target: {fileID: 5855821741443261692, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5855821741443261692, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_SizeDelta.y + value: 136.66667 + objectReference: {fileID: 0} + - target: {fileID: 5855821741443261693, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5855821741443261693, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5855821741443261693, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} - target: {fileID: 5855821741811488938, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} propertyPath: m_Name @@ -74872,6 +74907,11 @@ PrefabInstance: propertyPath: finish_bton value: objectReference: {fileID: 1923624324} + - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: textname + value: + objectReference: {fileID: 1923624325} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} --- !u!224 &1923624323 stripped @@ -74892,6 +74932,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1923624325 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5855821741443261693, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + m_PrefabInstance: {fileID: 1923624322} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1925617538 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity index c37f8cd1..0ed185bb 100644 Binary files a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity and b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity differ diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index 5da790f5..a6b406f9 100644 Binary files a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity and b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity differ