diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json index 19e6c1ac..274b2b36 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json @@ -250,6 +250,21 @@ } ] }, + { + "stepDescription": "加装封印", + "score": 0, + "actions": [ + { + "description": "盖上盒盖", + "score": 0, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "盖_透明外壳" + ] + } + ] + }, { "stepDescription": "加装封印", "score": 7, @@ -260,7 +275,6 @@ "isUI": false, "isSequential": false, "targetObjects": [ - "盖_透明外壳", "透明盖子封印碰撞R", "透明盖子封印碰撞L", "变电箱_门", diff --git a/SXElectricityInformationAcquisition/Assets/ToolManager.cs b/SXElectricityInformationAcquisition/Assets/ToolManager.cs index 1aaa7f80..36ea6875 100644 --- a/SXElectricityInformationAcquisition/Assets/ToolManager.cs +++ b/SXElectricityInformationAcquisition/Assets/ToolManager.cs @@ -216,6 +216,7 @@ public class ToolManager : MonoBehaviour Tool[4].gameObject.SetActive(true); TooslManager.instance.currentTool = Tool[4]; RetractBtn[2].gameObject.SetActive(true); + Tool[4].transform.localScale = new Vector3(1f, 1f, 1f);//LY } if (message == "Ե") { diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs index b96daf5c..340d683e 100644 --- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs +++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs @@ -114,12 +114,12 @@ public class Fieldobservation : MonoBehaviour { if (hit.collider.gameObject.name == "_͸") { - await ParentOverSealAsync(); + //await ParentOverSealAsync(); + StartCoroutine(ParentOverSealCoro()); BOXseal[0].enabled = true; BOXseal[1].enabled = true; //isbox = false; - guimen.GetComponent().enabled = true; } @@ -180,8 +180,9 @@ public class Fieldobservation : MonoBehaviour /// public async UniTask ParentOverSealAsync() { - Transparentover.transform.localPosition = new Vector3(0, 0, 0); - await UniTask.Delay(1000); // ȴ1 + await UniTask.Delay(500); + Transparentover.transform.localPosition = new Vector3(0, 0, 0);//HQB + await UniTask.Delay(500); // ȴ1 screw[0].SetActive(true); await UniTask.Delay(500); // ȴ0.5 @@ -196,6 +197,26 @@ public class Fieldobservation : MonoBehaviour MotionEngine.GetModule().HandleClick("_͸"); } + public IEnumerator ParentOverSealCoro() + { + DOTween.Kill(Transparentover); + if (DOTween.IsTweening(Transparentover)) + { + Debug.Log("Transparentover killing...."); + yield return null; + } + Transparentover.transform.localPosition = new Vector3(0, 0, 0); + screw[0].SetActive(true); + + yield return new WaitForSeconds(0.5f); + screw[0].transform.localPosition = new Vector3(-0.07357633f, -0.01137948f, 0.003414989f); + screw[1].SetActive(true); + yield return new WaitForSeconds(1.5f); + screw[1].transform.localPosition = new Vector3(0.07394123f, 0.013731f, 0.003414989f); + MotionEngine.GetModule().HandleClick("_͸"); + + } + /// /// ſ˨ /// diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs index c3b4836a..e3e99349 100644 --- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs +++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs @@ -72,13 +72,19 @@ public class TooslManager : MonoBehaviour tool.toolObject.transform.SetParent(PlayercameraTrans.transform); tool.toolObject.transform.localPosition = tool.originalPosition; tool.toolObject.transform.localRotation = tool.originalRotation; - if (tool.toolObject.transform.name == "ǯ") + if (tool.toolObject.transform.name == "ǯ")//LY { tool.toolObject.transform.localScale = new Vector3(0.000001f, 0.000001f, 0.000001f);//LY tool.returnButton.gameObject.SetActive(false); TooslManager.instance.currentTool = null; } - else + else if (tool.toolObject.transform.name == "˿")//LY + { + tool.toolObject.transform.localScale = new Vector3(0.000001f, 0.000001f, 0.000001f); + tool.returnButton.gameObject.SetActive(false); + TooslManager.instance.currentTool = null; + } + else { tool.toolObject.SetActive(false); }