This commit is contained in:
yulong 2024-04-02 18:05:49 +08:00
parent ef97d1ec5a
commit 97b54b731f
7 changed files with 65 additions and 6 deletions

View File

@ -31,6 +31,7 @@ public class Devicemovement : MonoBehaviour
void Update() void Update()
{ {
if (UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject()) return;
if (Input.GetMouseButtonDown(2)) if (Input.GetMouseButtonDown(2))
{ {
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);

View File

@ -23,13 +23,13 @@ public class Judgmentstate : MonoBehaviour
public Button initiate_botn;//开始推演按钮 public Button initiate_botn;//开始推演按钮
public Button finish_bton;//结束按钮 public Button finish_bton;//结束按钮
public Text textname;//显示账号文本
void Start() void Start()
{ {
textname.text = GlobalFlag.currentUser.login_name;
fanhui1.onClick.AddListener(() => fanhui1.onClick.AddListener(() =>
{ {
GameMain.tiao = false; GameMain.tiao = false;

View File

@ -361,8 +361,13 @@ public class Scenariopage : MonoBehaviour
private GameObject caodi;//学校周围的草地 private GameObject caodi;//学校周围的草地
public GameObject shandi;//山地地图 public GameObject shandi;//山地地图
public Camera hipotcamera;//学校相机的位置 public Camera hipotcamera;//学校相机的位置
/// <summary>
/// 显示登入的账号
/// </summary>
public Text textname;
void Start() void Start()
{ {
textname.text = GlobalFlag.currentUser.login_name;
xuexiao = GameObject.Find("主席台场景"); xuexiao = GameObject.Find("主席台场景");
caodi = GameObject.Find("Background"); caodi = GameObject.Find("Background");

View File

@ -35,6 +35,7 @@ public class Secondarymovement : MonoBehaviour
} }
void Update() void Update()
{ {
if (UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject()) return;
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
{ {
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741} 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 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -50579,8 +50579,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 70, y: 0} m_AnchoredPosition: {x: 90.81, y: 0}
m_SizeDelta: {x: 330, y: 120} m_SizeDelta: {x: 468.7426, y: 136.66667}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1033366231 --- !u!114 &1033366231
MonoBehaviour: MonoBehaviour:
@ -72648,7 +72648,7 @@ MonoBehaviour:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
randSeed: 433334625 randSeed: 91672796
isDoingTransition: 0 isDoingTransition: 0
minimumHeight: 0 minimumHeight: 0
--- !u!114 &1820978574 --- !u!114 &1820978574
@ -74732,6 +74732,41 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 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, - target: {fileID: 5855821741811488938, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -74872,6 +74907,11 @@ PrefabInstance:
propertyPath: finish_bton propertyPath: finish_bton
value: value:
objectReference: {fileID: 1923624324} objectReference: {fileID: 1923624324}
- target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: textname
value:
objectReference: {fileID: 1923624325}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
--- !u!224 &1923624323 stripped --- !u!224 &1923624323 stripped
@ -74892,6 +74932,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: 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 --- !u!1 &1925617538
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0