This commit is contained in:
taosuqi 2024-06-14 20:27:21 +08:00
parent 500317e3b7
commit 68af45d974
6 changed files with 95 additions and 61 deletions

View File

@ -123,7 +123,7 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &1801237716
--- !u!1001 &191666367
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -131,10 +131,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 737338796714740340, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -175,6 +171,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3749027150314622874, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_Name
value: APP
@ -188,4 +188,4 @@ PrefabInstance:
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1801237716}
- {fileID: 191666367}

View File

@ -10687,7 +10687,7 @@ MonoBehaviour:
overlayTextureUVSpace: 0
overlayTextureScale: 1
outline: 1
outlineColor: {r: 0, g: 1, b: 0.736887, a: 1}
outlineColor: {r: 0, g: 1, b: 0.089500904, a: 1}
outlineColorStyle: 0
outlineGradient:
serializedVersion: 2
@ -17563,7 +17563,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 799716864}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
m_Name:
@ -17741,7 +17741,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 0.16882038, y: 0.002265155, z: 0.080961935}
m_Center: {x: -0.00000011920929, y: -0.000030487776, z: -0.00000059604645}
@ -42782,6 +42782,7 @@ MonoBehaviour:
- {fileID: 1601934745}
- {fileID: 682339698}
EndOfProcessImage: {fileID: 1393670469}
SparentoverCol: {fileID: 799716872}
CabinetDoorLatch: {fileID: 601364442}
--- !u!65 &2018635917
BoxCollider:

View File

@ -86,6 +86,9 @@ public class Screwdriver : MonoBehaviour
Init();
}
/// <summary>
/// ³õʼ»¯
/// </summary>
void Init()
{
ElectricWireBcr.enabled = false;
@ -139,8 +142,8 @@ public class Screwdriver : MonoBehaviour
if (hit.collider.gameObject.name == ScrewObj[i].name)
{
Debug.Log(hit.collider.gameObject.name);
StartCoroutine(IEHubSegmentRowScrews());
ScrewObj[i].gameObject.SetActive(false);
StartCoroutine(IEHubSegmentRowScrews());
}
}
if (hit.collider.gameObject.name == "¹Ì¶¨ÂÝË¿_Rdown")
@ -365,7 +368,7 @@ public class Screwdriver : MonoBehaviour
/// <returns></returns>
IEnumerator IEHubSegmentRowScrews()
{
ScrewdriverTrans.gameObject.transform.DOLocalMove(new Vector3(3.1215f, 2.1383f, -1.3484f),0.5f);
ScrewdriverTrans.gameObject.transform.position = new Vector3(3.1215f, 2.1383f, -1.3484f);
yield return new WaitForSeconds(1);
}
IEnumerator right()

View File

@ -29,9 +29,9 @@ public class Seal : MonoBehaviour
public Image EndOfProcessImage;
/// <summary>
///
/// ͸Ã÷¸Ç×ÓÅöײ
/// </summary>
// public BoxCollider SparentoverCol;
public BoxCollider SparentoverCol;
/// <summary>
/// ¹ñÃÅ¿¨Ë¨
@ -64,6 +64,7 @@ public class Seal : MonoBehaviour
{
Sealcol[1].gameObject.SetActive(true);
CabinetDoorLatch.GetComponent<BoxCollider>().enabled = true;
SparentoverCol.GetComponent<BoxCollider>().enabled = true;
Debug.Log(hit.collider.gameObject.name);
}
}

View File

@ -5,6 +5,7 @@ using DefaultNamespace.ProcessMode;
using MotionFramework;
using UnityEngine;
using UnityEngine.UI;
using HighlightPlus;
public class Fieldobservation : MonoBehaviour
{
@ -74,6 +75,9 @@ public class Fieldobservation : MonoBehaviour
/// ¹ñÃÅboxÅöײ
/// </summary>
public BoxCollider guimenbox;
//public HighlightEffect _highlight;
void Start()
{
@ -163,17 +167,15 @@ public class Fieldobservation : MonoBehaviour
/// <returns></returns>
IEnumerator IEparentoverSeal()
{
Transparentover.transform.DOLocalMove(new Vector3(-90f, 0, 0), 1f);
Transparentover.transform.DOLocalRotate(new Vector3(0, 0, 0), 1f);
yield return new WaitForSeconds(1);
screw[0].gameObject.SetActive(true);
Transparentover.transform.DOLocalMove(new Vector3(-90f, 0, 0), 1f);
yield return new WaitForSeconds(1);
screw[0].gameObject.SetActive(true);
yield return new WaitForSeconds(0.5f);
screw[0].gameObject.transform.DOLocalMove(new Vector3(-90f, 0, 0), 1f);
screw[0].gameObject.transform.DOLocalMove(new Vector3(-0.07357633f, -0.01137948f, 0.003414989f), 1f);
screw[1].gameObject.SetActive(true);
yield return new WaitForSeconds(0.5f);
screw[1].gameObject.transform.DOLocalMove(new Vector3(-90f, 0, 0), 1f);
screw[1].gameObject.transform.DOLocalMove(new Vector3(-0.07394123f, 0.013731f, 0.003414989f), 1f);
}
@ -183,9 +185,9 @@ public class Fieldobservation : MonoBehaviour
/// <returns></returns>
IEnumerator IEguimenkashuan()
{
guimen.gameObject.transform.DOLocalMove(new Vector3(-90, 0, 0), 1);
guimen.gameObject.transform.DOLocalRotate(new Vector3(-90, 0, 0), 1);
yield return new WaitForSeconds(1.1f);
mensuo01.gameObject.transform.DOLocalMove(new Vector3(0, 0, 0), 1);
mensuo01.gameObject.transform.DOLocalRotate(new Vector3(0, 0, 0), 1);
}
}

View File

@ -1,63 +1,90 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{b366c870-8269-aeae-4186-8220020279aa}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{70C866B3-6982-AEAE-4186-8220020279AA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{e8ea8a32-db36-1909-a8a7-26f06060f4d3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{328AEAE8-36DB-0919-A8A7-26F06060F4D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{a90e88d8-badb-4199-850a-29eeee6b3832}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{D8880EA9-DBBA-9941-850A-29EEEE6B3832}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{2fd61c43-4224-9fcb-8a4a-9397608e2318}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{431CD62F-2442-CB9F-8A4A-9397608E2318}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{edefe799-dc28-4dd2-3165-1acb9e1a5d82}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{775d4e80-7b8a-c113-e64a-f0327b5a51d2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{7c2f9189-479d-675c-b95e-c95f88c2a560}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{89912F7C-9D47-5C67-B95E-C95F88C2A560}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{27e42685-adfb-0aa0-06e3-f5025d183005}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{8526E427-FBAD-A00A-06E3-F5025D183005}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{4d0abe3e-2eff-5141-cb61-b756eb38b78b}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{bae393ca-b3f2-035c-979c-ff7e0d806194}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{76df232d-8837-10f6-4eb2-65d4b80d2c66}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{2D23DF76-3788-F610-4EB2-65D4B80D2C66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{c5ee6955-1356-fe62-795c-07a46b224741}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{5569EEC5-5613-62FE-795C-07A46B224741}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{db9a3453-d36d-6192-985b-3e8cc856b5bd}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{53349ADB-6DD3-9261-985B-3E8CC856B5BD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.Build.0 = Debug|Any CPU
{e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.Build.0 = Debug|Any CPU
{edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.Build.0 = Debug|Any CPU
{db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.Build.0 = Release|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.Build.0 = Release|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.Build.0 = Release|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.Build.0 = Debug|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.ActiveCfg = Release|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.Build.0 = Release|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.Build.0 = Release|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.Build.0 = Release|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.Build.0 = Release|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.Build.0 = Release|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.Build.0 = Release|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.Build.0 = Release|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.Build.0 = Release|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.Build.0 = Release|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE