From bf398d3ad2d3ec21672ef444176a785ab6f1a760 Mon Sep 17 00:00:00 2001 From: guyuan9527 <2533167850@qq.com> Date: Thu, 14 Sep 2023 10:41:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4GameManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scenes/农家乐.unity | 138 +++++++++++++++++- .../Assets/Script/GameManager.meta | 8 + .../Assets/Script/GameManager/GameManager.cs | 28 ++++ .../Script/GameManager/GameManager.cs.meta | 11 ++ .../Assets/Script/KDLCamera/CameraManager.cs | 16 +- .../Script/Playercontrol/door_control.cs | 22 +-- .../Packages/packages-lock.json | 8 +- .../ProjectSettings/ProjectVersion.txt | 4 +- 8 files changed, 195 insertions(+), 40 deletions(-) create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Script/GameManager.meta create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs.meta diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity index ec44b5e0..c5d514c4 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.8771471, g: 0.9767031, b: 0.91905373, a: 1} + m_IndirectSpecularColor: {r: 0.91471344, g: 1.0185646, b: 0.94445914, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -5002,7 +5002,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &68751280 RectTransform: m_ObjectHideFlags: 0 @@ -5446,7 +5446,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &75116807 RectTransform: m_ObjectHideFlags: 0 @@ -5470,7 +5470,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 736, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 420.9, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &75116808 MonoBehaviour: @@ -43657,7 +43657,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &670172548 RectTransform: m_ObjectHideFlags: 0 @@ -70857,7 +70857,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1161730342002128517, guid: 91e57c5e176fd914ab04b706629acb31, type: 3} propertyPath: m_LocalPosition.x - value: 11.82 + value: 10.85 objectReference: {fileID: 0} - target: {fileID: -1161730342002128517, guid: 91e57c5e176fd914ab04b706629acb31, type: 3} propertyPath: m_LocalPosition.y @@ -94054,6 +94054,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1424258179} m_Mesh: {fileID: 3156224286390153965, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1 &1425909734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1425909735} + m_Layer: 0 + m_Name: overlook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1425909735 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425909734} + m_LocalRotation: {x: 0.19522125, y: 0.7348541, z: -0.23726773, w: 0.6046339} + m_LocalPosition: {x: 16.829397, y: 16.72296, z: 291.89148} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 21 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1428010675 GameObject: m_ObjectHideFlags: 0 @@ -97334,7 +97365,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1484629983 RectTransform: m_ObjectHideFlags: 0 @@ -101295,6 +101326,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1540097468} m_CullTransparentMesh: 1 +--- !u!1 &1543654485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1543654487} + - component: {fileID: 1543654486} + m_Layer: 0 + m_Name: CameraManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1543654486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1543654485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01162971d7c67094a817188dbdea753b, type: 3} + m_Name: + m_EditorClassIdentifier: + Btn: {fileID: 0} + trans: {fileID: 1425909735} + tempPos: {x: 0, y: 0, z: 0} +--- !u!4 &1543654487 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1543654485} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 18.33248, y: 16.590982, z: 297.62115} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 22 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1544357922 GameObject: m_ObjectHideFlags: 0 @@ -129120,6 +129198,50 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1965669222} m_Mesh: {fileID: 435700780152703353, guid: e898196d74f62e441bd98f3104180dd5, type: 3} +--- !u!1 &1965873572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1965873574} + - component: {fileID: 1965873573} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1965873573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965873572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72a1134478d9f7647812f295f1989d7d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1965873574 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965873572} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 18.33248, y: 16.590982, z: 297.62115} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1967784486 GameObject: m_ObjectHideFlags: 0 @@ -212052,7 +212174,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &6282625688644869778 GameObject: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager.meta b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager.meta new file mode 100644 index 00000000..9e20ad67 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7bb2142ac546aa4090fd94b023d7894 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs new file mode 100644 index 00000000..adc1b3ec --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameManager : MonoBehaviour +{ + public static GameManager ins; + public CameraManager CameraManager; + List tools; + public void Awake() + { + if (ins!=null) + { + Destroy(ins); + return; + } + ins = this; + } + // Start is called before the first frame update + void Start() + { + + } + public void ToolsShow() + { + + } +} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs.meta b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs.meta new file mode 100644 index 00000000..458aab76 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 72a1134478d9f7647812f295f1989d7d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLCamera/CameraManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLCamera/CameraManager.cs index 9128e79e..225398b1 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLCamera/CameraManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLCamera/CameraManager.cs @@ -7,18 +7,20 @@ using TMPro; public class CameraManager : MonoBehaviour { [SerializeField] Button Btn; - Transform trans; + [SerializeField]Transform trans; [SerializeField] Vector3 tempPos; Quaternion RotePos; TextMeshProUGUI text; - int sum = 2;// - // Start is called before the first frame update - private void Start() + /// + /// øֵ + /// + /// + public void BtnOnClick(Toggle to) { text = Btn.GetComponentInChildren(); - Btn.onClick.AddListener(() => + to.onValueChanged.AddListener((x) => { - if (sum%2==0) + if (x) { OverLook(); text.text = "ͼ"; @@ -28,9 +30,7 @@ public class CameraManager : MonoBehaviour ReturnLook(); text.text = "ͼ"; } - sum++; }); - trans = GameObject.Find("overlook").transform; tempPos = transform.position; RotePos = transform.rotation; } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs index 53ce9ae8..63c162d5 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs @@ -16,16 +16,11 @@ public class door_control : MonoBehaviour // Start is called before the first frame update void Start() { - EventTriggerListener.Get(transform.gameObject).onClick_Data += Onclick; + //EventTriggerListener.Get(transform.gameObject).onClick_Data += Onclick; } - void Onclick(GameObject go,PointerEventData e) { - //if (.activeSelf == true) - // return; - if(e.button != (PointerEventData.InputButton)mouseButton) - return; - - - // Ƿ = !Ƿ; + private void OnMouseDown() + { + // Ƿ = !Ƿ; if (ý == true) {//sssssssss Ƿ = !Ƿ; @@ -44,14 +39,5 @@ public class door_control : MonoBehaviour } } - return; - - - - } - // Update is called once per frame - void Update() - { - } } diff --git a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json index 0cbeb9db..f98f7bdf 100644 --- a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json +++ b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json @@ -35,12 +35,12 @@ "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.rider": "3.0.15", + "com.unity.ide.rider": "3.0.16", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", "com.unity.test-framework": "1.1.31", - "com.unity.testtools.codecoverage": "1.0.1" + "com.unity.testtools.codecoverage": "1.2.2" } }, "com.unity.ide.rider": { @@ -92,7 +92,7 @@ "url": "https://packages.unity.cn" }, "com.unity.services.core": { - "version": "1.4.2", + "version": "1.6.0", "depth": 1, "source": "registry", "dependencies": { @@ -121,7 +121,7 @@ "url": "https://packages.unity.cn" }, "com.unity.testtools.codecoverage": { - "version": "1.0.1", + "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": { diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt index bc2ff943..cda402b2 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.10f1c2 -m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5) +m_EditorVersion: 2021.3.15f1c1 +m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda)