From 9f3153ee9dbed78c3b6f170d5d2d3a138e836306 Mon Sep 17 00:00:00 2001
From: "2274240467@qq.com" <2274240467@qq.com>
Date: Mon, 24 Jun 2024 17:26:11 +0800
Subject: [PATCH] =?UTF-8?q?json=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Assets/Scenes/单独.unity | 54 ++++-----
.../Assets/Scenes/现场 _Test.unity | 54 ++++-----
.../Assets/Seal.cs | 45 +++++---
.../DataConfig/SceneStepData.json | 12 +-
.../Assets/concentrator.cs | 26 +++--
.../Assets/taoruiqi/AdhesiveTape.cs | 10 +-
.../Assets/taoruiqi/Pliers.cs | 45 +++++---
.../taoruiqi/Script/ElectricCheckPen.cs | 27 +++--
.../taoruiqi/Script/Field observation.cs | 106 ++++++++++--------
.../Assets/taoruiqi/Script/RotationOfDoor.cs | 3 +
.../Assets/taoruiqi/WorkPermit.cs | 6 +-
11 files changed, 225 insertions(+), 163 deletions(-)
diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity b/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity
index 3d5d7b31..e0c4485c 100644
--- a/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/单独.unity
@@ -7429,6 +7429,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ConcentratorObj: {fileID: 274807175}
+ ElectricWireSMR: {fileID: 886368899}
+ TapeMarCol: {fileID: 886368898}
+ TapeMar: {fileID: 2100000, guid: ddf175dcba94e8d46bc6b6d68d61c395, type: 2}
+ Cover: {fileID: 274807158}
+ oncentratorTrans: {fileID: 528088251}
+ screw:
+ - {fileID: 274807157}
+ - {fileID: 274807156}
ScrewObj:
- {fileID: 274807171}
- {fileID: 274807170}
@@ -7440,14 +7448,6 @@ MonoBehaviour:
- {fileID: 274807164}
- {fileID: 274807161}
- {fileID: 274807160}
- ElectricWireSMR: {fileID: 886368899}
- TapeMarCol: {fileID: 886368898}
- TapeMar: {fileID: 2100000, guid: ddf175dcba94e8d46bc6b6d68d61c395, type: 2}
- Cover: {fileID: 274807158}
- screw:
- - {fileID: 274807157}
- - {fileID: 274807156}
- oncentratorTrans: {fileID: 528088251}
--- !u!1 &277098938
GameObject:
m_ObjectHideFlags: 0
@@ -11596,8 +11596,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ElectricCheckPenOBJ: {fileID: 542005244}
- ElectricCheckPenMater: {fileID: 2100000, guid: a09bcf13701d86049ac4e1219d051234, type: 2}
ElectricalInspectionOfficeTrans: {fileID: 107762421}
+ ElectricCheckPenMater: {fileID: 2100000, guid: a09bcf13701d86049ac4e1219d051234, type: 2}
useColorOn: 1
--- !u!114 &552801122
MonoBehaviour:
@@ -13796,21 +13796,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 17d504e1c391fac4792b98af1135ad00, type: 3}
m_Name:
m_EditorClassIdentifier:
- Cameraobj: {fileID: 616989522}
ExclamationPointBtn: {fileID: 1154671473}
+ Cameraobj: {fileID: 616989522}
UptheladderPos: {fileID: 624250339}
Transparentover: {fileID: 1946036048}
- screw:
- - {fileID: 362067760}
- - {fileID: 362067767}
- BOXseal:
- - {fileID: 1946036050}
- - {fileID: 1946036049}
guimenkashuan: {fileID: 1273617170}
guimen: {fileID: 1273617172}
mensuo01: {fileID: 1273617171}
guimenbox: {fileID: 1273617173}
- fengy: {fileID: 1946036051}
+ BOXseal:
+ - {fileID: 1946036050}
+ - {fileID: 1946036049}
+ screw:
+ - {fileID: 362067760}
+ - {fileID: 362067767}
isPlayerOnLadder: 0
--- !u!4 &616989522
Transform:
@@ -31106,20 +31105,20 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SealObj: {fileID: 1498050634}
+ EndOfProcessImage: {fileID: 311586025}
+ DoorLatch: {fileID: 1273617172}
+ guimenbox: {fileID: 1273617173}
+ guimenkashuan: {fileID: 1273617170}
+ NewFengy: {fileID: 1489253522}
+ parentoverSeal:
+ - {fileID: 1932535631}
+ - {fileID: 1759107963}
Sealcol:
- {fileID: 274807173}
- {fileID: 274807172}
sealbcl:
- {fileID: 599369151}
- {fileID: 662253428}
- EndOfProcessImage: {fileID: 311586025}
- DoorLatch: {fileID: 1273617172}
- guimenbox: {fileID: 1273617173}
- parentoverSeal:
- - {fileID: 1932535631}
- - {fileID: 1759107963}
- guimenkashuan: {fileID: 1273617170}
- fengy: {fileID: 1489253522}
--- !u!1 &1501822397
GameObject:
m_ObjectHideFlags: 0
@@ -38299,11 +38298,6 @@ BoxCollider:
m_CorrespondingSourceObject: {fileID: 6950902267587906511, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
m_PrefabInstance: {fileID: 362067757}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1946036051 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 8810976127009250453, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
- m_PrefabInstance: {fileID: 362067757}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1949062803
GameObject:
m_ObjectHideFlags: 0
diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
index 97a2d346..4f46d288 100644
--- a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
@@ -20746,11 +20746,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1137393215}
m_CullTransparentMesh: 1
---- !u!1 &1143738318 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 8810976127009250453, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
- m_PrefabInstance: {fileID: 601364440}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1146142253
GameObject:
m_ObjectHideFlags: 0
@@ -30449,8 +30444,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ElectricCheckPenOBJ: {fileID: 1641925554}
- ElectricCheckPenMater: {fileID: 2100000, guid: a09bcf13701d86049ac4e1219d051234, type: 2}
ElectricalInspectionOfficeTrans: {fileID: 707065182}
+ ElectricCheckPenMater: {fileID: 2100000, guid: a09bcf13701d86049ac4e1219d051234, type: 2}
useColorOn: 1
--- !u!1 &1642999859
GameObject:
@@ -35577,6 +35572,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ConcentratorObj: {fileID: 1485260145}
+ ElectricWireSMR: {fileID: 1061297896}
+ TapeMarCol: {fileID: 1061297897}
+ TapeMar: {fileID: 2100000, guid: ddf175dcba94e8d46bc6b6d68d61c395, type: 2}
+ Cover: {fileID: 1755457971}
+ oncentratorTrans: {fileID: 1268051676}
+ screw:
+ - {fileID: 402936984}
+ - {fileID: 2058113440}
ScrewObj:
- {fileID: 1485260157}
- {fileID: 1485260156}
@@ -35588,14 +35591,6 @@ MonoBehaviour:
- {fileID: 1485260150}
- {fileID: 1485260147}
- {fileID: 1485260146}
- ElectricWireSMR: {fileID: 1061297896}
- TapeMarCol: {fileID: 1061297897}
- TapeMar: {fileID: 2100000, guid: ddf175dcba94e8d46bc6b6d68d61c395, type: 2}
- Cover: {fileID: 1755457971}
- screw:
- - {fileID: 402936984}
- - {fileID: 2058113440}
- oncentratorTrans: {fileID: 1268051676}
--- !u!1 &1904368290
GameObject:
m_ObjectHideFlags: 0
@@ -37798,20 +37793,20 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SealObj: {fileID: 2018635915}
+ EndOfProcessImage: {fileID: 1393670469}
+ DoorLatch: {fileID: 708227703}
+ guimenbox: {fileID: 601364442}
+ guimenkashuan: {fileID: 601364444}
+ NewFengy: {fileID: 420255419}
+ parentoverSeal:
+ - {fileID: 446965974}
+ - {fileID: 2008679881}
Sealcol:
- {fileID: 691769116}
- {fileID: 691769115}
sealbcl:
- {fileID: 1601934745}
- {fileID: 682339698}
- EndOfProcessImage: {fileID: 1393670469}
- DoorLatch: {fileID: 708227703}
- guimenbox: {fileID: 601364442}
- parentoverSeal:
- - {fileID: 446965974}
- - {fileID: 2008679881}
- guimenkashuan: {fileID: 601364444}
- fengy: {fileID: 420255419}
--- !u!65 &2018635917
BoxCollider:
m_ObjectHideFlags: 0
@@ -231839,21 +231834,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 17d504e1c391fac4792b98af1135ad00, type: 3}
m_Name:
m_EditorClassIdentifier:
- Cameraobj: {fileID: 6121626523908351175}
ExclamationPointBtn: {fileID: 1323160595}
+ Cameraobj: {fileID: 6121626523908351175}
UptheladderPos: {fileID: 1987581050}
Transparentover: {fileID: 799716865}
- screw:
- - {fileID: 274585737}
- - {fileID: 1799387239}
- BOXseal:
- - {fileID: 1392108184}
- - {fileID: 1130307471}
guimenkashuan: {fileID: 601364444}
guimen: {fileID: 708227703}
mensuo01: {fileID: 601364445}
guimenbox: {fileID: 522830941}
- fengy: {fileID: 1143738318}
+ BOXseal:
+ - {fileID: 1392108184}
+ - {fileID: 1130307471}
+ screw:
+ - {fileID: 274585737}
+ - {fileID: 1799387239}
isPlayerOnLadder: 0
--- !u!114 &6121626523908351181
MonoBehaviour:
diff --git a/SXElectricityInformationAcquisition/Assets/Seal.cs b/SXElectricityInformationAcquisition/Assets/Seal.cs
index 86bac985..7bd7c54c 100644
--- a/SXElectricityInformationAcquisition/Assets/Seal.cs
+++ b/SXElectricityInformationAcquisition/Assets/Seal.cs
@@ -11,21 +11,16 @@ using UnityEngine.UI;
public class Seal : MonoBehaviour
{
+ [Header("װӡ")]
///
/// װӡ
///
public GameObject SealObj;
+ [Header("̽image")]
///
- /// ¼Ϸӡ
+ /// ̽image
///
- public GameObject[] Sealcol;
-
- ///
- /// ӡboxײ
- ///
- public BoxCollider[] sealbcl;
-
public Image EndOfProcessImage;
///
@@ -33,29 +28,49 @@ public class Seal : MonoBehaviour
///
// public BoxCollider SparentoverCol;
+ [Header("߹")]
///
/// ߹
///
public GameObject DoorLatch;
+ [Header("boxײ")]
///
/// boxײ
///
public BoxCollider guimenbox;
- ///
- /// ϵķӡ
- ///
- public GameObject[] parentoverSeal;
-
+ [Header("ſ˨ײ")]
///
/// ſ˨ײ
///
public BoxCollider guimenkashuan;
- public GameObject fengy;
+ [Header("ϵ·ӡ")]
+ ///
+ /// ϵ·ӡ
+ ///
+ public GameObject NewFengy;
+ [Header("ϵķӡ")]
+ ///
+ /// ϵķӡ
+ ///
+ public GameObject[] parentoverSeal;
+ [Header("¼Ϸӡ")]
+ ///
+ /// ¼Ϸӡ
+ ///
+ public GameObject[] Sealcol;
+
+ [Header("ӡboxײ")]
+ ///
+ /// ӡboxײ
+ ///
+ public BoxCollider[] sealbcl;
+
+ [Header("жϷӡǷ")]
///
/// жϷӡǷ
///
@@ -113,7 +128,7 @@ public class Seal : MonoBehaviour
}
if (hit.collider.gameObject.name == "ſ˨")
{
- fengy.gameObject.SetActive(true);
+ NewFengy.gameObject.SetActive(true);
//fengy.transform.localPosition = new Vector3(0.6371536f, 0.02661133f, -0.01525164f);
MotionEngine.GetModule().HandleClick(hit.collider.gameObject.name);
}
diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json
index 06c4402c..c0de034d 100644
--- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json
@@ -191,8 +191,8 @@
"JZQ_螺丝0033",
"JZQ_螺丝004",
"JZQ_螺丝0044",
- "JZQ_螺丝005",
- "JZQ_螺丝006"
+ "JZQ_螺丝006",
+ "JZQ_螺丝007"
]
}
]
@@ -313,6 +313,14 @@
]
},
+ {
+ "description": "加装封印",
+ "score": 0,
+ "isSequential": false,
+ "targetObjects": [
+ "变电箱_门"
+ ]
+ },
{
"description": "加装封印",
"score": 0,
diff --git a/SXElectricityInformationAcquisition/Assets/concentrator.cs b/SXElectricityInformationAcquisition/Assets/concentrator.cs
index 952254fb..73ceaaee 100644
--- a/SXElectricityInformationAcquisition/Assets/concentrator.cs
+++ b/SXElectricityInformationAcquisition/Assets/concentrator.cs
@@ -10,28 +10,27 @@ using UnityEngine;
///
public class concentrator : MonoBehaviour
{
+ [Header("")]
///
///
///
public GameObject ConcentratorObj;
- ///
- /// ˿
- ///
- public GameObject[] ScrewObj;
-
+ [Header("ߺе߶")]
///
/// ߺе߶
///
public SkinnedMeshRenderer ElectricWireSMR;
+ [Header("ײ")]
///
/// ײ
///
public BoxCollider TapeMarCol;
+ [Header("ǰνʶ")]
///
- /// ǰν
+ /// ǰνʶ
///
public Material TapeMar;
@@ -40,25 +39,36 @@ public class concentrator : MonoBehaviour
///
int allls;
+ [Header("Ƿż˿߶")]
///
/// Ƿż˿߶
///
public static bool isPlayAni = true;
+ [Header("")]
///
///
///
public GameObject Cover;
+ [Header("¼ڵеλ")]
+ ///
+ /// ¼ڵеλ
+ ///
+ public Transform oncentratorTrans;
+
+ [Header("¼˿")]
///
/// ¼˿
///
public GameObject[] screw;
+ [Header("˿")]
///
- /// ¼ڵеλ
+ /// ˿
///
- public Transform oncentratorTrans;
+ public GameObject[] ScrewObj;
+
bool isplaying = true;
// Start is called before the first frame update
diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/AdhesiveTape.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/AdhesiveTape.cs
index a242011d..b3622392 100644
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/AdhesiveTape.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/AdhesiveTape.cs
@@ -11,36 +11,43 @@ using UnityEngine;
public class AdhesiveTape : MonoBehaviour
{
+ [Header("Ե")]
///
/// Ե
///
public GameObject TapeOBJ;
+ [Header("ǰν")]
///
/// ǰν
///
public Material TapeMar;
+ [Header("ײ")]
///
/// ײ
///
public BoxCollider TapeMarCol;
+ [Header("ʹúλ")]
///
/// ʹúλ
///
public Transform TapeTrans;
+ [Header("")]
///
///
///
public Transform PlayerCamera;
+ [Header("бǯԭʼλ")]
///
/// бǯԭʼλ
///
private Vector3 originalPosition;
+ [Header("бǯԭʼת")]
///
/// бǯԭʼת
///
@@ -61,7 +68,6 @@ using UnityEngine;
TapeMar.SetFloat("_step_p4", 0);
TapeMar.SetFloat("_step_p5", 0);
TapeMar.SetFloat("_step_p6", 0);
- //TapeMar.SetFloat("_step_p1", 1);
}
// Update is called once per frame
@@ -105,8 +111,6 @@ using UnityEngine;
TapeMar.SetFloat("_step_p6", 1);
yield return new WaitForSeconds(1f);
StartCoroutine(TapeBack());
- //yield return new WaitForSeconds(1.5f);
- //TapeOBJ.gameObject.SetActive(false);
}
///
diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Pliers.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Pliers.cs
index 90d9d2c5..3e20fd8b 100644
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Pliers.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Pliers.cs
@@ -10,71 +10,86 @@ using UnityEngine;
///
public class Pliers : MonoBehaviour
{
+ [Header("ǯ")]
///
/// ǯ
///
public GameObject PliersObj;
+ [Header("ǯ")]
///
/// ǯ
///
public SkinnedMeshRenderer PliersSki;
+ [Header("ӡ")]
///
/// ӡ
///
public SkinnedMeshRenderer ElectricBoxSkinnedMeshRenderer;
+ [Header("ұ߷ӡ")]
///
/// ұ߷ӡ
///
public SkinnedMeshRenderer RightSkinnedMeshRenderer;
+ [Header("߷ӡ")]
///
/// ߷ӡ
///
public SkinnedMeshRenderer LeftSkinnedMeshRenderer;
+ [Header("ұ߷ӡ")]
///
/// ұ߷ӡ
///
public SkinnedMeshRenderer RconcentratorSMR;
+ [Header("߷ӡ")]
///
/// ߷ӡ
///
public SkinnedMeshRenderer LconcentratorSMR;
+ [Header("")]
///
///
///
public Transform Doorlock;
- ///
- ///
- ///
- public Transform DoorOfCabinet;
-
- ///
- /// Ƿ
- ///
- bool Onladder ;
-
- ///
- /// бǯǯÿӡλ
- ///
- public Transform[] InteractivePliersTrans;
-
+ [Header("߽ĸ")]
///
/// ߽ĸ
///
public GameObject PlayerCamera;
+ [Header("")]
+ ///
+ ///
+ ///
+ public Transform DoorOfCabinet;
+
+ [Header("Ƿ")]
+ ///
+ /// Ƿ
+ ///
+ bool Onladder ;
+
+ [Header("бǯǯÿӡλ")]
+ ///
+ /// бǯǯÿӡλ
+ ///
+ public Transform[] InteractivePliersTrans;
+
+
+ [Header("бǯԭʼλ")]
///
/// бǯԭʼλ
///
private Vector3 originalPosition;
+ [Header(" бǯԭʼת")]
///
/// бǯԭʼת
///
diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs
index 612df5b1..d18bd616 100644
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs
@@ -13,37 +13,40 @@ using Unity.VisualScripting;
///
public class ElectricCheckPen : MonoBehaviour
{
+ [Header("ǯ")]
///
///
///
public GameObject ElectricCheckPenOBJ;
+ [Header("ʲ紦")]
+ ///
+ /// ʲ紦
+ ///
+ public Transform ElectricalInspectionOfficeTrans;
+
+ [Header("ʱ")]
///
/// ʱ
///
public Material ElectricCheckPenMater;
+ [Header("ж")]
+ public bool useColorOn = true; // ʹɫIJֵ
+
///
/// Ƿ
///
bool issocket;
- ///
- /// ʲ紦
- ///
- public Transform ElectricalInspectionOfficeTrans;
- public bool useColorOn = true; // ʹɫIJֵ
- ///
- /// Ҫĸ
- ///
- //public GameObject PlayerCamera;
void Start()
{
ElectricCheckPenMater.SetFloat("_SwitchOfEmi", 0);
}
+
///
- /// 磬䲻
+ /// 䲻
///
void Update()
{
@@ -73,6 +76,9 @@ public class ElectricCheckPen : MonoBehaviour
}
}
}
+ ///
+ ///
+ ///
private void OnMouseDown()
{
if (gameObject.name == "")
@@ -80,6 +86,7 @@ public class ElectricCheckPen : MonoBehaviour
Warninglight();
}
}
+
///
/// ʵ
///
diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs
index 20032c2d..2b93b293 100644
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs
@@ -10,74 +10,83 @@ using HighlightPlus;
public class Fieldobservation : MonoBehaviour
{
public static Fieldobservation Instance;
- ///
- ///
- ///
- public Transform Cameraobj;
+ [Header("水ť")]
///
/// 水ť
///
public Button ExclamationPointBtn;
- bool isclick;
+ [Header("")]
+ ///
+ ///
+ ///
+ public Transform Cameraobj;
+ [Header("Ӻ")]
///
/// Ӻ
///
public Transform UptheladderPos;
+ [Header("")]
///
///
///
public Transform Transparentover;
+ [Header("ſ˨ײ")]
+ ///
+ /// ſ˨ײ
+ ///
+ public BoxCollider guimenkashuan;
+
+ [Header("")]
+ ///
+ ///
+ ///
+ public GameObject guimen;
+
+ [Header("01")]
+ ///
+ /// 01
+ ///
+ public GameObject mensuo01;
+
+ [Header("boxײ")]
+ ///
+ /// boxײ
+ ///
+ public BoxCollider guimenbox;
+
+ [Header("ϵķӡcubeײ")]
+ ///
+ /// ϵķӡcubeײ
+ ///
+ public BoxCollider[] BOXseal;
+
+ [Header("ϵ˿")]
///
/// ϵ˿
///
public GameObject[] screw;
+ [Header("ж")]
+ ///
+ /// жǷ
+ ///
+ public bool isPlayerOnLadder = false;
+
///
/// жϷӡǷ
///
bool isbox = true;
- ///
- /// ϵķӡcubeײ
- ///
- public BoxCollider[] BOXseal;
+ bool isclick;
- ///
- /// ſ˨ײ
- ///
- public BoxCollider guimenkashuan;
- /////
- ///// ϵķӡ
- /////
- //public GameObject[] parentoverSeal;
+ //public GameObject fengy;
- ///
- ///
- ///
- public GameObject guimen;
-
- ///
- /// 01
- ///
- public GameObject mensuo01;
-
- ///
- /// boxײ
- ///
- public BoxCollider guimenbox;
-
- public GameObject fengy;
-
- ///
- /// жǷ
- ///
- public bool isPlayerOnLadder = false;
private void Awake()
{
Instance = this;
@@ -100,16 +109,11 @@ public class Fieldobservation : MonoBehaviour
if (hit.collider.gameObject.name == "_")
{
StartCoroutine(IEparentoverSeal());
-
BOXseal[0].enabled = true;
BOXseal[1].enabled = true;
//isbox = false;
-
MotionEngine.GetModule().HandleClick(hit.collider.gameObject.name);
-
-
}
-
if (hit.collider.gameObject.name == "_")
{
StartCoroutine(IEguimenkashuan());
@@ -125,6 +129,10 @@ public class Fieldobservation : MonoBehaviour
}
}
+ ///
+ /// ײ
+ ///
+ ///
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.name == "UptheladderPos")
@@ -142,7 +150,7 @@ public class Fieldobservation : MonoBehaviour
}
///
- /// û뿪npc水ťʧ
+ /// 뿪npc水ťʧ
///
///
private void OnTriggerExit(Collider other)
@@ -154,12 +162,8 @@ public class Fieldobservation : MonoBehaviour
}
- public bool IsPlayerOnLadder()
- {
- return isPlayerOnLadder;
- }
///
- /// ϵķӡ
+ /// ϵķӡ
///
///
IEnumerator IEparentoverSeal()
@@ -186,4 +190,8 @@ public class Fieldobservation : MonoBehaviour
mensuo01.gameObject.transform.DOLocalRotate(new Vector3(0, 0, 0), 1);
guimenkashuan.gameObject.GetComponent().enabled = true;
}
+ public bool IsPlayerOnLadder()
+ {
+ return isPlayerOnLadder;
+ }
}
diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/RotationOfDoor.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/RotationOfDoor.cs
index ab4de2e4..190e0bbe 100644
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/RotationOfDoor.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/RotationOfDoor.cs
@@ -11,16 +11,19 @@ using UnityEngine;
///
public class RotationOfDoor : MonoBehaviour
{
+ [Header("")]
///
///
///
public Transform Outerdoor;
+ [Header("ڲ")]
///
/// ڲ
///
public Transform Inneredoor;
+ [Header("դڲײ")]
///
/// դڲײ
///
diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/WorkPermit.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/WorkPermit.cs
index cd837889..c6b6d679 100644
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/WorkPermit.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/WorkPermit.cs
@@ -6,32 +6,36 @@ using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.UI;
-
///
///
///
public class WorkPermit : MonoBehaviour
{
+ [Header("")]
///
///
///
public GameObject WorkPermitObj;
+ [Header("Ի")]
///
/// Ի
///
public Image Dialogbox;
+ [Header("Իtext")]
///
/// Իtext
///
public Text DialogboxText;
+ [Header("ť")]
///
/// ť
///
public Button ContinueBtn;
+ [Header("һ仰ť")]
///
/// һ仰ť
///