This commit is contained in:
YangHua 2024-07-31 19:32:11 +08:00
parent 18619c666b
commit 77d096b151
10 changed files with 347 additions and 267 deletions

View File

@ -14,9 +14,9 @@ public class JunctionBox : MonoBehaviour
/// </summary> /// </summary>
public Transform TransparentlidObj; public Transform TransparentlidObj;
/// <summary> /// <summary>
/// 똥綾탤<E7B6BE>杰唐룐丹뵨쭁介 /// 똥綾탤<E7B6BE>杰唐룐丹뵨쭁介
/// </summary> /// </summary>
public GameObject[] AllObjects; public GameObject[] AllObjects;
/// <summary> /// <summary>
@ -28,7 +28,7 @@ public class JunctionBox : MonoBehaviour
/// 高亮物体 /// 高亮物体
/// </summary> /// </summary>
//public GameObject[] AllHightObj; //public GameObject[] AllHightObj;
/// <summary> /// <summary>
/// 接线盒是否盖上 /// 接线盒是否盖上
/// </summary> /// </summary>
@ -37,14 +37,14 @@ public class JunctionBox : MonoBehaviour
/// <summary> /// <summary>
/// 滑块的原始位置 /// 滑块的原始位置
/// </summary> /// </summary>
private List<Vector3> originalPosition=new List<Vector3>(); private List<Vector3> originalPosition = new List<Vector3>();
/// <summary> /// <summary>
/// 滑块的原始旋转 /// 滑块的原始旋转
/// </summary> /// </summary>
private Quaternion originalRotation; private Quaternion originalRotation;
bool isanzhaung =false; bool isanzhaung = false;
/// <summary> /// <summary>
/// 接线盒上的封印和螺丝 /// 接线盒上的封印和螺丝
@ -70,7 +70,7 @@ public class JunctionBox : MonoBehaviour
//originalRotation = GameObjectSlider[i].transform.localRotation; //originalRotation = GameObjectSlider[i].transform.localRotation;
} }
} }
/// <summary> /// <summary>
/// 是否高亮 /// 是否高亮
/// </summary> /// </summary>
@ -97,102 +97,119 @@ public class JunctionBox : MonoBehaviour
// } // }
// } // }
//} //}
void Update() void Update()
{ {
if (EventSystem.current.IsPointerOverGameObject()) if (EventSystem.current.IsPointerOverGameObject())
return; return;
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
{ {
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit; RaycastHit hit;
bool raycast = Physics.Raycast(ray, out hit); bool raycast = Physics.Raycast(ray, out hit);
if (raycast) if (raycast)
{ {
if (iscover) if (iscover)
{ //判断盖子是否打开 { //判断盖子是否打开
switch (hit.collider.gameObject.name) if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
{ {
// case "쌈窟분李蕨뺄욥001":
// hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.06131744f, -0.0075f, 0.0089f), 1f); switch (hit.collider.gameObject.name)
// Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); {
// break; // case "쌈窟분李蕨뺄욥001":
// case "쌈窟분李蕨뺄욥002": // hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.06131744f, -0.0075f, 0.0089f), 1f);
// hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.02013969f, -0.0075f, 0.0089f), 1f); // Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
// Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); // break;
// break; // case "쌈窟분李蕨뺄욥002":
// case "쌈窟분李蕨뺄욥003": // hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.02013969f, -0.0075f, 0.0089f), 1f);
// hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.02001452f, -0.0075f, 0.0089f), 1f); // Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
// Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); // break;
// break; // case "쌈窟분李蕨뺄욥003":
case "쌈窟분李蕨뺄욥004": // hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.02001452f, -0.0075f, 0.0089f), 1f);
hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.06075525f, -0.00784f, 0.0089f), 1f); // Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); // break;
break; case "쌈窟분李蕨뺄욥004":
case "쌈窟분뷘蕨<EBB798>뺄욥003": hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.06075525f, -0.00784f, 0.0089f), 1f);
hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.04339f, 0.0058f, -0.00263f), 1f); Debug.Log(hit.collider.gameObject.name);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
break; break;
case "쌈窟분李蕨뺄욥003": case "쌈窟분뷘蕨<EBB798>뺄욥003":
hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.02001452f, -0.0074f, 0.0089f), 1f); hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.04339f, 0.0058f, -0.00263f), 1f);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); Debug.Log(hit.collider.gameObject.name);
break; //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
case "쌈窟분뷘蕨<EBB798>뺄욥001": break;
hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.00316f, 0.0058f, -0.00263f), 1f); case "쌈窟분李蕨뺄욥003":
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.02001452f, -0.0074f, 0.0089f), 1f);
break; Debug.Log(hit.collider.gameObject.name);
case "쌈窟분李蕨뺄욥002": //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.02013969f, -0.008f, 0.0089f), 1f); break;
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); case "쌈窟분뷘蕨<EBB798>뺄욥001":
break; hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.00316f, 0.0058f, -0.00263f), 1f);
case "쌈窟분뷘蕨<EBB798>뺄욥002": Debug.Log(hit.collider.gameObject.name);
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.0372f, 0.0058f, -0.0026f), 1f); //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); break;
break; case "쌈窟분李蕨뺄욥002":
case "쌈窟분李蕨뺄욥001": hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.02013969f, -0.008f, 0.0089f), 1f);
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.06131744f, -0.0079f, 0.0089f), 1f); Debug.Log(hit.collider.gameObject.name);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
break; break;
case "쌈窟분뷘蕨<EBB798>뺄욥002":
case "힛宮_唐빳먁포_轟밟률_쌈窟분_A宮_뷘蕨苟뺄욥_攣횅": hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.0372f, 0.0058f, -0.0026f), 1f);
hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.0404f, -0.0058f, -0.0026f), 1f); Debug.Log(hit.collider.gameObject.name);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
break; break;
case "힛宮_唐빳먁포_轟밟률_쌈窟분_B宮_뷘蕨苟뺄욥_攣횅": case "쌈窟분李蕨뺄욥001":
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0f, -0.0058f, -0.0026f), 1f); hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.06131744f, -0.0079f, 0.0089f), 1f);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); Debug.Log(hit.collider.gameObject.name);
break; //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
case "힛宮_唐빳먁포_轟밟률_쌈窟분_C宮_뷘蕨苟뺄욥_攣횅": break;
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.0408f, -0.0058f, -0.0026f), 1f);
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); case "힛宮_唐빳먁포_轟밟률_쌈窟분_A宮_뷘蕨苟뺄욥_攣횅":
break; hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.0404f, -0.0058f, -0.0026f), 1f);
Debug.Log(hit.collider.gameObject.name);
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
break;
case "힛宮_唐빳먁포_轟밟률_쌈窟분_B宮_뷘蕨苟뺄욥_攣횅":
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0f, -0.0058f, -0.0026f), 1f);
Debug.Log(hit.collider.gameObject.name);
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
break;
case "힛宮_唐빳먁포_轟밟률_쌈窟분_C宮_뷘蕨苟뺄욥_攣횅":
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.0408f, -0.0058f, -0.0026f), 1f);
Debug.Log(hit.collider.gameObject.name);
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
break;
}
} }
} }
if (AreAllTool()) if (AreAllTool())
{ {
switch (hit.collider.gameObject.name) if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
{ {
case "쌈窟분李蕨뺄욥001": switch (hit.collider.gameObject.name)
hit.collider.gameObject.transform.DOLocalMove(originalPosition[0], 1f); {
Debug.Log(hit.collider.gameObject.name); case "쌈窟분李蕨뺄욥001":
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); hit.collider.gameObject.transform.DOLocalMove(originalPosition[0], 1f);
break; Debug.Log(hit.collider.gameObject.name);
case "쌈窟분李蕨뺄욥002": //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
hit.collider.gameObject.transform.DOLocalMove(originalPosition[1], 1f); break;
Debug.Log(hit.collider.gameObject.name); case "쌈窟분李蕨뺄욥002":
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); hit.collider.gameObject.transform.DOLocalMove(originalPosition[1], 1f);
break; Debug.Log(hit.collider.gameObject.name);
case "쌈窟분李蕨뺄욥003": //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
hit.collider.gameObject.transform.DOLocalMove(originalPosition[2], 1f); break;
Debug.Log(hit.collider.gameObject.name); case "쌈窟분李蕨뺄욥003":
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); hit.collider.gameObject.transform.DOLocalMove(originalPosition[2], 1f);
break; Debug.Log(hit.collider.gameObject.name);
case "쌈窟분李蕨뺄욥004": //MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
hit.collider.gameObject.transform.DOLocalMove(originalPosition[3], 1f); break;
Debug.Log(hit.collider.gameObject.name); case "쌈窟분李蕨뺄욥004":
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); hit.collider.gameObject.transform.DOLocalMove(originalPosition[3], 1f);
break; Debug.Log(hit.collider.gameObject.name);
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
break;
}
} }
} }

View File

@ -11736,6 +11736,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8378556726591945539, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalPosition.x
value: -0.2719
objectReference: {fileID: 0}
- target: {fileID: 8378556726591945539, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalPosition.z
value: -0.0224
objectReference: {fileID: 0}
- target: {fileID: 8499604590529379764, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} - target: {fileID: 8499604590529379764, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled propertyPath: m_Enabled
value: 0 value: 0
@ -23113,7 +23121,7 @@ Transform:
m_GameObject: {fileID: 1268051675} m_GameObject: {fileID: 1268051675}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.5000007, y: -0.49999928, z: -0.49999928, w: 0.5000007} m_LocalRotation: {x: -0.5000007, y: -0.49999928, z: -0.49999928, w: 0.5000007}
m_LocalPosition: {x: 302.8246, y: 2.8406801, z: 163.17392} m_LocalPosition: {x: 302.8283, y: 2.8406801, z: 163.17392}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []

View File

@ -168,12 +168,11 @@ public class Screwdriver : MonoBehaviour
{ {
//if (EventSystem.current.IsPointerOverGameObject()) //if (EventSystem.current.IsPointerOverGameObject())
// return; // return;
if (!gameObject.activeSelf) return;
if (Ischaiwan == true) if (Ischaiwan == true)
{ {
chaiwan(); chaiwan();
} }
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
{//Camera.transform.forward {//Camera.transform.forward
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
@ -181,90 +180,117 @@ public class Screwdriver : MonoBehaviour
bool raycast = Physics.Raycast(ray, out hit); bool raycast = Physics.Raycast(ray, out hit);
if (raycast) if (raycast)
{ {
if (hit.collider.gameObject.name == "맨_미땍쭁介_Rup") if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
{ {
ScrewdriverTrans.gameObject.transform.SetParent(null); if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "쭁介독")
StartCoroutine(Rscrew()); {
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); if (hit.collider.gameObject.name == "맨_미땍쭁介_Rup")
} {
if (hit.collider.gameObject.name == "미땍쭁介_Ldown") ScrewdriverTrans.gameObject.transform.SetParent(null);
{ StartCoroutine(Rscrew());
ScrewdriverTrans.gameObject.transform.SetParent(null); Debug.Log(hit.collider.gameObject.name);
StartCoroutine(Lscrew()); }
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); if (hit.collider.gameObject.name == "미땍쭁介_Ldown")
} {
if (hit.collider.gameObject.name == "옳미땍쭁介_R") //if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
{ //{
ScrewdriverTrans.gameObject.transform.SetParent(null); ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name); StartCoroutine(Lscrew());
StartCoroutine(IERconcentratorScrew()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); Debug.Log(hit.collider.gameObject.name);
} //}
if (hit.collider.gameObject.name == "옳미땍쭁介_L") }
{ if (hit.collider.gameObject.name == "옳미땍쭁介_R")
ScrewdriverTrans.gameObject.transform.SetParent(null); {
Debug.Log(hit.collider.gameObject.name); //if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
StartCoroutine(IELconcentratorScrew()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); //{
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
StartCoroutine(IERconcentratorScrew());
//}
}
if (hit.collider.gameObject.name == "옳미땍쭁介_L")
{
//if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
//{
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
StartCoroutine(IELconcentratorScrew());
//}
}
if (hit.collider.gameObject.name == "미땍쭁介_Rdown")
{
//if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
//{
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
StartCoroutine(right());
//}
}
if (hit.collider.gameObject.name == "섞든포미땍쭁介_Ldown")
{
//if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
//{
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
StartCoroutine(left());
//}
}
}
} }
for (int i = 0; i < ScrewObj.Length; i++) for (int i = 0; i < ScrewObj.Length; i++)
{ {
if (ScrewObj[i] != null && hit.collider.gameObject.name == ScrewObj[i].name) if (ScrewObj[i] != null && hit.collider.gameObject.name == ScrewObj[i].name)
{ {
ScrewdriverTrans.gameObject.transform.SetPositionAndRotation(OpenScrewScrewdriverTrans[4].gameObject.transform.position, OpenScrewScrewdriverTrans[4].gameObject.transform.rotation); if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "쭁介독")
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
ScrewObj[i].gameObject.SetActive(false);
switch (hit.collider.gameObject.name)
{ {
case "JZQ_쭁介001": if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
{
ScrewdriverTrans.gameObject.transform.SetPositionAndRotation(OpenScrewScrewdriverTrans[4].gameObject.transform.position, OpenScrewScrewdriverTrans[4].gameObject.transform.rotation);
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
ScrewObj[i].gameObject.SetActive(false); ScrewObj[i].gameObject.SetActive(false);
break; switch (hit.collider.gameObject.name)
case "JZQ_쭁介0011": {
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介001":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介002": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介0011":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介0022": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介002":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介003": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介0022":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介0033": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介003":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介004": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介0033":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介0044": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介004":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介005": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介0044":
break; ScrewObj[i].gameObject.SetActive(false);
case "JZQ_쭁介006": break;
ScrewObj[i].gameObject.SetActive(false); case "JZQ_쭁介005":
break; ScrewObj[i].gameObject.SetActive(false);
break;
case "JZQ_쭁介006":
ScrewObj[i].gameObject.SetActive(false);
break;
}
}
} }
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
} }
} }
if (hit.collider.gameObject.name == "미땍쭁介_Rdown")
{
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
StartCoroutine(right());
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
if (hit.collider.gameObject.name == "섞든포미땍쭁介_Ldown")
{
ScrewdriverTrans.gameObject.transform.SetParent(null);
Debug.Log(hit.collider.gameObject.name);
StartCoroutine(left());
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
if (AreAllObjectsHidden()) if (AreAllObjectsHidden())
{ {
@ -278,16 +304,10 @@ public class Screwdriver : MonoBehaviour
StartCoroutine(IEConcentratorScrew()); StartCoroutine(IEConcentratorScrew());
} }
//集中器螺丝全隐藏后播放电线动画 //集中器螺丝全隐藏后播放电线动画
if (AreAllObjectsHiddens()/*&& concentrator.isPlayAni*/) if (AreAllObjectsHiddens() /*&& concentrator.isPlayAni*/)
{ {
//issplit =false;
StartCoroutine(ScrewdriverBack()); StartCoroutine(ScrewdriverBack());
ElectricWireSMR.SetBlendShapeWeight(0, 100);
ElectricWireSMR.SetBlendShapeWeight(1, 100);
ElectricWireSMR.SetBlendShapeWeight(2, 100);
ElectricWireSMR.SetBlendShapeWeight(3, 100);
ElectricWireSMR.SetBlendShapeWeight(4, 100);
ElectricWireSMR.SetBlendShapeWeight(5, 100);
ElectricWireBcr.enabled = true; ElectricWireBcr.enabled = true;
//拆完集中器下端螺丝后才能拆掉集中器后端四颗螺丝 //拆完集中器下端螺丝后才能拆掉集中器后端四颗螺丝
for (int i = 0; i < ConcentratorScrewObj.Length; i++) for (int i = 0; i < ConcentratorScrewObj.Length; i++)
@ -357,10 +377,10 @@ public class Screwdriver : MonoBehaviour
issplit = true; issplit = true;
} }
if (!ScrewObj[0].activeInHierarchy && !ScrewObj[1].activeInHierarchy && !ScrewObj[2].activeInHierarchy && !ScrewObj[3].activeInHierarchy && !ScrewObj[4].activeInHierarchy && !ScrewObj[5].activeInHierarchy && !ScrewObj[6].activeInHierarchy && !ScrewObj[7].activeInHierarchy && !ScrewObj[8].activeInHierarchy) //if (!ScrewObj[0].activeInHierarchy && !ScrewObj[1].activeInHierarchy && !ScrewObj[2].activeInHierarchy && !ScrewObj[3].activeInHierarchy && !ScrewObj[4].activeInHierarchy && !ScrewObj[5].activeInHierarchy && !ScrewObj[6].activeInHierarchy && !ScrewObj[7].activeInHierarchy && !ScrewObj[8].activeInHierarchy)
{ //{
Ischaiwan = false; // Ischaiwan = false;
} //}
} }
//Ischaiwan = false; //Ischaiwan = false;
} }
@ -437,7 +457,7 @@ public class Screwdriver : MonoBehaviour
{ {
foreach (GameObject obj in ConcentratorScrewObj) foreach (GameObject obj in ConcentratorScrewObj)
{ {
if (obj.activeInHierarchy) if (obj != null && obj.activeInHierarchy)
{ {
issplit = false; issplit = false;
return false; return false;
@ -706,10 +726,13 @@ public class Screwdriver : MonoBehaviour
/// <returns></returns> /// <returns></returns>
IEnumerator IEConcentratorScrew() IEnumerator IEConcentratorScrew()
{ {
ConcentratorObj.gameObject.transform.DOLocalMove(new Vector3(-0.2719f, 2.24768f, -0.0772f), 0.5f); if (ConcentratorObj.gameObject != null)
yield return new WaitForSeconds(1f); {
Destroy(ConcentratorObj.gameObject); ConcentratorObj.gameObject.transform.DOLocalMove(new Vector3(-0.2719f, 2.24768f, -0.0772f), 0.5f);
//OldConcentrator.gameObject.SetActive(false); yield return new WaitForSeconds(1f);
//Destroy(ConcentratorObj.gameObject);
OldConcentrator.gameObject.SetActive(false);
}
} }
/// <summary> /// <summary>
/// 旧的集线器背后右边螺丝 /// 旧的集线器背后右边螺丝

View File

@ -12,7 +12,7 @@ public class ConsumePowerManager : MonoBehaviour
public static ConsumePowerManager Instance; public static ConsumePowerManager Instance;
public delegate void OpenLight(); public delegate void OpenLight();
public event OpenLight OnOpenLight; public event OpenLight OnOpenLight;
private void Awake() private void Awake()
{ {
Instance = this; Instance = this;
@ -21,13 +21,13 @@ public class ConsumePowerManager : MonoBehaviour
public Button confirmBt; public Button confirmBt;
void Start() void Start()
{ {
confirmBt.onClick.AddListener(delegate confirmBt.onClick.AddListener(delegate
{ {
MotionEngine.GetModule<AnimationProcessManager>().HandleClick("临时用电"); MotionEngine.GetModule<AnimationProcessManager>().HandleClick("临时用电");
// MotionEngine.GetModule<AnimationProcessManager>().HandleClick("现场调试"); // MotionEngine.GetModule<AnimationProcessManager>().HandleClick("现场调试");
OnOpenLight(); OnOpenLight?.Invoke();
}); });
} }

View File

@ -68,7 +68,7 @@ namespace ToolsPack
MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPackWindowItemBts(btName, index); MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPackWindowItemBts(btName, index);
break; break;
} }
MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowTemp().SetActive(false); MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowTemp().SetActive(false);
}); });
} }

View File

@ -172,6 +172,7 @@ public class ToolManager : MonoBehaviour
//} //}
public void HandleStringEvents(string message) public void HandleStringEvents(string message)
{ {
TooslManager.instance.currentTool = null;
if (generateAreaScript.IsPlayerInArea()) if (generateAreaScript.IsPlayerInArea())
{ {
if (message == "炅綾") if (message == "炅綾")
@ -198,28 +199,34 @@ public class ToolManager : MonoBehaviour
if (message == "괆窟풂") if (message == "괆窟풂")
{ {
Tool[2].gameObject.SetActive(true); Tool[2].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[2];
RetractBtn[0].gameObject.SetActive(true); RetractBtn[0].gameObject.SetActive(true);
} }
if (message == "쭁介독") if (message == "쭁介독")
{ {
Tool[4].gameObject.SetActive(true); Tool[4].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[4];
RetractBtn[2].gameObject.SetActive(true); RetractBtn[2].gameObject.SetActive(true);
} }
if (message == "없鍍스던") if (message == "없鍍스던")
{ {
Tool[5].gameObject.SetActive(true); Tool[5].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[5];
RetractBtn[3].gameObject.SetActive(true); RetractBtn[3].gameObject.SetActive(true);
} }
if (message == "l謹섞櫓포") if (message == "l謹섞櫓포")
{ {
Tool[6].gameObject.SetActive(true); Tool[6].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[6];
return;
// RetractBtn[4].gameObject.SetActive(true); // RetractBtn[4].gameObject.SetActive(true);
} }
if (message == "분陋룐丹") if (message == "분陋룐丹")
{ {
Tool[7].gameObject.SetActive(true); Tool[7].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[7];
RetractBtn[4].gameObject.SetActive(true); RetractBtn[4].gameObject.SetActive(true);
} }

View File

@ -92,10 +92,10 @@ public class concentrator : MonoBehaviour
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
//if (EventSystem.current.IsPointerOverGameObject()) //if (EventSystem.current.IsPointerOverGameObject())
// return; // return;
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
{ {
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
@ -103,58 +103,62 @@ public class concentrator : MonoBehaviour
bool raycast = Physics.Raycast(ray, out hit); bool raycast = Physics.Raycast(ray, out hit);
if (raycast) if (raycast)
{ {
if (hit.collider.gameObject.name == "新的集中器碰撞") if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
{ {
ConcentratorObj.gameObject.transform.SetParent(null); if (hit.collider.gameObject.name == "新的集中器碰撞")
StartCoroutine(Newconcentrator()); {
Debug.Log(hit.collider.gameObject.name);
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
ConcentratorObj.gameObject.transform.SetParent(null);
StartCoroutine(Newconcentrator());
R.GetComponent<BoxCollider>().enabled = true;
L.GetComponent<BoxCollider>().enabled = true;
Debug.Log(hit.collider.gameObject.name);
}
R.GetComponent<BoxCollider>().enabled = true; if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "螺丝刀")
L.GetComponent<BoxCollider>().enabled = true; {
} if (hit.collider.gameObject.name == "JZQ_螺丝1")
{
StartCoroutine(TapeBackFrist());
NewScrewObj[0].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[1].GetComponent<MeshRenderer>().enabled = true;
if (hit.collider.gameObject.name == "JZQ_螺丝1") }
{ else if (hit.collider.gameObject.name == "JZQ_螺丝2")
StartCoroutine(TapeBackFrist()); {
NewScrewObj[0].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[1].GetComponent<MeshRenderer>().enabled = true; StartCoroutine(TapeBackSecond());
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); NewScrewObj[2].GetComponent<MeshRenderer>().enabled = true;
} NewScrewObj[3].GetComponent<MeshRenderer>().enabled = true;
else if (hit.collider.gameObject.name == "JZQ_螺丝2") }
{ else if (hit.collider.gameObject.name == "JZQ_螺丝3")
StartCoroutine(TapeBackSecond()); {
NewScrewObj[2].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[3].GetComponent<MeshRenderer>().enabled = true; StartCoroutine(TapeBackThird());
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); NewScrewObj[4].GetComponent<MeshRenderer>().enabled = true;
} NewScrewObj[5].GetComponent<MeshRenderer>().enabled = true;
else if (hit.collider.gameObject.name == "JZQ_螺丝3") }
{ else if (hit.collider.gameObject.name == "JZQ_螺丝4")
StartCoroutine(TapeBackThird()); {
NewScrewObj[4].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[5].GetComponent<MeshRenderer>().enabled = true; StartCoroutine(TapeBackFourth());
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); NewScrewObj[6].GetComponent<MeshRenderer>().enabled = true;
} NewScrewObj[7].GetComponent<MeshRenderer>().enabled = true;
else if (hit.collider.gameObject.name == "JZQ_螺丝4") }
{ else if (hit.collider.gameObject.name == "JZQ_螺丝6")
StartCoroutine(TapeBackFourth()); {
NewScrewObj[6].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[7].GetComponent<MeshRenderer>().enabled = true; StartCoroutine(TapeBackFifth());
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); NewScrewObj[8].GetComponent<MeshRenderer>().enabled = true;
} }
else if (hit.collider.gameObject.name == "JZQ_螺丝6") else if (hit.collider.gameObject.name == "JZQ_螺丝7")
{ {
StartCoroutine(TapeBackFifth());
NewScrewObj[8].GetComponent<MeshRenderer>().enabled = true; StartCoroutine(TapeBackSixth());
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); NewScrewObj[9].GetComponent<MeshRenderer>().enabled = true;
} }
else if (hit.collider.gameObject.name == "JZQ_螺丝7") }
{
StartCoroutine(TapeBackSixth());
NewScrewObj[9].GetComponent<MeshRenderer>().enabled = true;
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
} }
// for (int i = 0; i < ScrewObj.Length; i++) // for (int i = 0; i < ScrewObj.Length; i++)

View File

@ -28,21 +28,24 @@ public class CompleteOverComponent : MonoBehaviour
switch (MotionEngine.GetModule<DataConfigManager>().GetProcessMode()) switch (MotionEngine.GetModule<DataConfigManager>().GetProcessMode())
{ {
case ProcessMode.Teaching: case ProcessMode.Teaching:
text.text = "本次教学实训总分"; text.text = "本次教学实训完成";
scoreText.gameObject.SetActive(false);
break; break;
case ProcessMode.Training: case ProcessMode.Training:
text.text = "本次培训实训总分"; text.text = "本次培训实训总分";
scoreText.text = score.ToString();
break; break;
case ProcessMode.Practice: case ProcessMode.Practice:
text.text = "本次练习实训总分"; text.text = "本次练习实训总分";
scoreText.text = score.ToString();
break; break;
case ProcessMode.Assessment: case ProcessMode.Assessment:
text.text = "本次考核模式总分"; text.text = "本次考核模式总分";
scoreText.text = score.ToString();
break; break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
scoreText.text=score.ToString();

View File

@ -117,6 +117,7 @@ public class Pliers : MonoBehaviour
//判断在梯子上 //判断在梯子上
if (!Onladder) if (!Onladder)
{ {
if (!gameObject.activeSelf) return;
if (EventSystem.current.IsPointerOverGameObject()) if (EventSystem.current.IsPointerOverGameObject())
return; return;
@ -127,44 +128,60 @@ public class Pliers : MonoBehaviour
bool raycast = Physics.Raycast(ray, out hit); bool raycast = Physics.Raycast(ray, out hit);
if (raycast) if (raycast)
{ {
if (hit.collider.gameObject.name == "柜门_封印") if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "剥线钳")
{ {
PliersObj.gameObject.transform.SetParent(null); if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
StartCoroutine(PliersIE()); {
Debug.Log(hit.collider.gameObject.name); if (hit.collider.gameObject.name == "柜门_封印")
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); {
} PliersObj.gameObject.transform.SetParent(null);
StartCoroutine(PliersIE());
Debug.Log(hit.collider.gameObject.name);
}
if (hit.collider.gameObject.name == "接线盒_封印R")
{
PliersObj.gameObject.transform.SetParent(null);
StartCoroutine(JunctionBoxRight());
Debug.Log(hit.collider.gameObject.name);
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
if (hit.collider.gameObject.name == "接线盒_封印L") if (hit.collider.gameObject.name == "接线盒_封印R")
{ {
PliersObj.gameObject.transform.SetParent(null); //if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
StartCoroutine(JunctionBoxLeft()); //{
Debug.Log(hit.collider.gameObject.name);
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
if (hit.collider.gameObject.name == "集中器_封印R") PliersObj.gameObject.transform.SetParent(null);
{ StartCoroutine(JunctionBoxRight());
PliersObj.gameObject.transform.SetParent(null); Debug.Log(hit.collider.gameObject.name);
StartCoroutine(RightRconcentrator()); //}
Debug.Log(hit.collider.gameObject.name); }
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
if (hit.collider.gameObject.name == "集中器_封印_L") if (hit.collider.gameObject.name == "接线盒_封印L")
{ {
PliersObj.gameObject.transform.SetParent(null); //if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
StartCoroutine(LeftRconcentrator()); //{
Debug.Log(hit.collider.gameObject.name); PliersObj.gameObject.transform.SetParent(null);
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name); StartCoroutine(JunctionBoxLeft());
Debug.Log(hit.collider.gameObject.name);
//}
}
if (hit.collider.gameObject.name == "集中器_封印R")
{
//if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
//{
PliersObj.gameObject.transform.SetParent(null);
StartCoroutine(RightRconcentrator());
Debug.Log(hit.collider.gameObject.name);
//}
}
if (hit.collider.gameObject.name == "集中器_封印_L")
{
//if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
//{
PliersObj.gameObject.transform.SetParent(null);
StartCoroutine(LeftRconcentrator());
Debug.Log(hit.collider.gameObject.name);
//}
}
}
} }
} }
} }

View File

@ -37,6 +37,7 @@ public class TooslManager : MonoBehaviour
public Transform PlayercameraTrans; public Transform PlayercameraTrans;
public static TooslManager instance; public static TooslManager instance;
public GameObject currentTool = null;
/// <summary> /// <summary>
/// 引用Ladder脚本 /// 引用Ladder脚本