221
This commit is contained in:
parent
18619c666b
commit
77d096b151
|
|
@ -112,6 +112,9 @@ public class JunctionBox : MonoBehaviour
|
|||
{
|
||||
if (iscover)
|
||||
{ //털뙤맨綾角뤠댔역
|
||||
if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
|
||||
{
|
||||
|
||||
switch (hit.collider.gameObject.name)
|
||||
{
|
||||
// case "쌈窟분李蕨뺄욥001":
|
||||
|
|
@ -128,73 +131,87 @@ public class JunctionBox : MonoBehaviour
|
|||
// break;
|
||||
case "쌈窟분李蕨뺄욥004":
|
||||
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;
|
||||
case "쌈窟분뷘蕨<EBB798>뺄욥003":
|
||||
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);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
case "쌈窟분李蕨뺄욥003":
|
||||
hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.02001452f, -0.0074f, 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;
|
||||
case "쌈窟분뷘蕨<EBB798>뺄욥001":
|
||||
hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.00316f, 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);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
case "쌈窟분李蕨뺄욥002":
|
||||
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.02013969f, -0.008f, 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;
|
||||
case "쌈窟분뷘蕨<EBB798>뺄욥002":
|
||||
hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.0372f, 0.0058f, -0.0026f), 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;
|
||||
case "쌈窟분李蕨뺄욥001":
|
||||
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);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
|
||||
case "힛宮_唐빳먁포_轟밟률_쌈窟분_A宮_뷘蕨苟뺄욥_攣횅":
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (AreAllTool())
|
||||
{
|
||||
if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
|
||||
{
|
||||
switch (hit.collider.gameObject.name)
|
||||
{
|
||||
case "쌈窟분李蕨뺄욥001":
|
||||
hit.collider.gameObject.transform.DOLocalMove(originalPosition[0], 1f);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
case "쌈窟분李蕨뺄욥002":
|
||||
hit.collider.gameObject.transform.DOLocalMove(originalPosition[1], 1f);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
case "쌈窟분李蕨뺄욥003":
|
||||
hit.collider.gameObject.transform.DOLocalMove(originalPosition[2], 1f);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
case "쌈窟분李蕨뺄욥004":
|
||||
hit.collider.gameObject.transform.DOLocalMove(originalPosition[3], 1f);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11736,6 +11736,14 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 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}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
|
|
@ -23113,7 +23121,7 @@ Transform:
|
|||
m_GameObject: {fileID: 1268051675}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
|
|||
|
|
@ -168,46 +168,86 @@ public class Screwdriver : MonoBehaviour
|
|||
{
|
||||
//if (EventSystem.current.IsPointerOverGameObject())
|
||||
// return;
|
||||
|
||||
if (!gameObject.activeSelf) return;
|
||||
if (Ischaiwan == true)
|
||||
{
|
||||
chaiwan();
|
||||
}
|
||||
|
||||
if (Input.GetMouseButtonDown(0))
|
||||
{//Camera.transform.forward
|
||||
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
|
||||
RaycastHit hit;
|
||||
bool raycast = Physics.Raycast(ray, out hit);
|
||||
if (raycast)
|
||||
{
|
||||
if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
|
||||
{
|
||||
if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "쭁介독")
|
||||
{
|
||||
if (hit.collider.gameObject.name == "盖_固定螺丝_Rup")
|
||||
{
|
||||
ScrewdriverTrans.gameObject.transform.SetParent(null);
|
||||
StartCoroutine(Rscrew());
|
||||
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
}
|
||||
if (hit.collider.gameObject.name == "固定螺丝_Ldown")
|
||||
{
|
||||
//if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
|
||||
//{
|
||||
ScrewdriverTrans.gameObject.transform.SetParent(null);
|
||||
StartCoroutine(Lscrew());
|
||||
Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
//}
|
||||
}
|
||||
if (hit.collider.gameObject.name == "壳固定螺丝_R")
|
||||
{
|
||||
//if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
|
||||
//{
|
||||
ScrewdriverTrans.gameObject.transform.SetParent(null);
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
StartCoroutine(IERconcentratorScrew()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(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()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(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++)
|
||||
{
|
||||
if (ScrewObj[i] != null && hit.collider.gameObject.name == ScrewObj[i].name)
|
||||
{
|
||||
if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "쭁介독")
|
||||
{
|
||||
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);
|
||||
|
|
@ -246,24 +286,10 @@ public class Screwdriver : MonoBehaviour
|
|||
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())
|
||||
|
|
@ -280,14 +306,8 @@ public class Screwdriver : MonoBehaviour
|
|||
//集中器螺丝全隐藏后播放电线动画
|
||||
if (AreAllObjectsHiddens() /*&& concentrator.isPlayAni*/)
|
||||
{
|
||||
//issplit =false;
|
||||
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;
|
||||
//拆完集中器下端螺丝后才能拆掉集中器后端四颗螺丝
|
||||
for (int i = 0; i < ConcentratorScrewObj.Length; i++)
|
||||
|
|
@ -357,10 +377,10 @@ public class Screwdriver : MonoBehaviour
|
|||
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)
|
||||
{
|
||||
Ischaiwan = false;
|
||||
}
|
||||
//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;
|
||||
}
|
||||
|
|
@ -437,7 +457,7 @@ public class Screwdriver : MonoBehaviour
|
|||
{
|
||||
foreach (GameObject obj in ConcentratorScrewObj)
|
||||
{
|
||||
if (obj.activeInHierarchy)
|
||||
if (obj != null && obj.activeInHierarchy)
|
||||
{
|
||||
issplit = false;
|
||||
return false;
|
||||
|
|
@ -705,11 +725,14 @@ public class Screwdriver : MonoBehaviour
|
|||
/// </summary>
|
||||
/// <returns></returns>
|
||||
IEnumerator IEConcentratorScrew()
|
||||
{
|
||||
if (ConcentratorObj.gameObject != null)
|
||||
{
|
||||
ConcentratorObj.gameObject.transform.DOLocalMove(new Vector3(-0.2719f, 2.24768f, -0.0772f), 0.5f);
|
||||
yield return new WaitForSeconds(1f);
|
||||
Destroy(ConcentratorObj.gameObject);
|
||||
//OldConcentrator.gameObject.SetActive(false);
|
||||
//Destroy(ConcentratorObj.gameObject);
|
||||
OldConcentrator.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 旧的集线器背后右边螺丝
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class ConsumePowerManager : MonoBehaviour
|
|||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick("临时用电");
|
||||
// MotionEngine.GetModule<AnimationProcessManager>().HandleClick("现场调试");
|
||||
|
||||
OnOpenLight();
|
||||
OnOpenLight?.Invoke();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -172,6 +172,7 @@ public class ToolManager : MonoBehaviour
|
|||
//}
|
||||
public void HandleStringEvents(string message)
|
||||
{
|
||||
TooslManager.instance.currentTool = null;
|
||||
if (generateAreaScript.IsPlayerInArea())
|
||||
{
|
||||
if (message == "炅綾")
|
||||
|
|
@ -198,28 +199,34 @@ public class ToolManager : MonoBehaviour
|
|||
if (message == "괆窟풂")
|
||||
{
|
||||
Tool[2].gameObject.SetActive(true);
|
||||
TooslManager.instance.currentTool = Tool[2];
|
||||
RetractBtn[0].gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
if (message == "쭁介독")
|
||||
{
|
||||
Tool[4].gameObject.SetActive(true);
|
||||
TooslManager.instance.currentTool = Tool[4];
|
||||
RetractBtn[2].gameObject.SetActive(true);
|
||||
}
|
||||
if (message == "없鍍스던")
|
||||
{
|
||||
Tool[5].gameObject.SetActive(true);
|
||||
TooslManager.instance.currentTool = Tool[5];
|
||||
RetractBtn[3].gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
if (message == "l謹섞櫓포")
|
||||
{
|
||||
Tool[6].gameObject.SetActive(true);
|
||||
TooslManager.instance.currentTool = Tool[6];
|
||||
return;
|
||||
// RetractBtn[4].gameObject.SetActive(true);
|
||||
}
|
||||
if (message == "분陋룐丹")
|
||||
{
|
||||
Tool[7].gameObject.SetActive(true);
|
||||
TooslManager.instance.currentTool = Tool[7];
|
||||
RetractBtn[4].gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -102,59 +102,63 @@ public class concentrator : MonoBehaviour
|
|||
RaycastHit hit;
|
||||
bool raycast = Physics.Raycast(ray, out hit);
|
||||
if (raycast)
|
||||
{
|
||||
if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
|
||||
{
|
||||
if (hit.collider.gameObject.name == "新的集中器碰撞")
|
||||
{
|
||||
|
||||
ConcentratorObj.gameObject.transform.SetParent(null);
|
||||
StartCoroutine(Newconcentrator());
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
|
||||
|
||||
透明盖子封印碰撞R.GetComponent<BoxCollider>().enabled = true;
|
||||
透明盖子封印碰撞L.GetComponent<BoxCollider>().enabled = true;
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
}
|
||||
|
||||
|
||||
if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "ÂÝË¿µ¶")
|
||||
{
|
||||
if (hit.collider.gameObject.name == "JZQ_螺丝1")
|
||||
{
|
||||
|
||||
StartCoroutine(TapeBackFrist());
|
||||
NewScrewObj[0].GetComponent<MeshRenderer>().enabled = true;
|
||||
NewScrewObj[1].GetComponent<MeshRenderer>().enabled = true;
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
|
||||
}
|
||||
else if (hit.collider.gameObject.name == "JZQ_螺丝2")
|
||||
{
|
||||
|
||||
StartCoroutine(TapeBackSecond());
|
||||
NewScrewObj[2].GetComponent<MeshRenderer>().enabled = true;
|
||||
NewScrewObj[3].GetComponent<MeshRenderer>().enabled = true;
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
}
|
||||
else if (hit.collider.gameObject.name == "JZQ_螺丝3")
|
||||
{
|
||||
|
||||
StartCoroutine(TapeBackThird());
|
||||
NewScrewObj[4].GetComponent<MeshRenderer>().enabled = true;
|
||||
NewScrewObj[5].GetComponent<MeshRenderer>().enabled = true;
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
}
|
||||
else if (hit.collider.gameObject.name == "JZQ_螺丝4")
|
||||
{
|
||||
|
||||
StartCoroutine(TapeBackFourth());
|
||||
NewScrewObj[6].GetComponent<MeshRenderer>().enabled = true;
|
||||
NewScrewObj[7].GetComponent<MeshRenderer>().enabled = true;
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
}
|
||||
else if (hit.collider.gameObject.name == "JZQ_螺丝6")
|
||||
{
|
||||
|
||||
StartCoroutine(TapeBackFifth());
|
||||
NewScrewObj[8].GetComponent<MeshRenderer>().enabled = true;
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
}
|
||||
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++)
|
||||
|
|
|
|||
|
|
@ -28,21 +28,24 @@ public class CompleteOverComponent : MonoBehaviour
|
|||
switch (MotionEngine.GetModule<DataConfigManager>().GetProcessMode())
|
||||
{
|
||||
case ProcessMode.Teaching:
|
||||
text.text = "本次教学实训总分";
|
||||
text.text = "本次教学实训完成";
|
||||
scoreText.gameObject.SetActive(false);
|
||||
break;
|
||||
case ProcessMode.Training:
|
||||
text.text = "本次培训实训总分";
|
||||
scoreText.text = score.ToString();
|
||||
break;
|
||||
case ProcessMode.Practice:
|
||||
text.text = "本次练习实训总分";
|
||||
scoreText.text = score.ToString();
|
||||
break;
|
||||
case ProcessMode.Assessment:
|
||||
text.text = "本次考核模式总分";
|
||||
scoreText.text = score.ToString();
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
scoreText.text=score.ToString();
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ public class Pliers : MonoBehaviour
|
|||
//判断在梯子上
|
||||
if (!Onladder)
|
||||
{
|
||||
if (!gameObject.activeSelf) return;
|
||||
if (EventSystem.current.IsPointerOverGameObject())
|
||||
return;
|
||||
|
||||
|
|
@ -126,45 +127,61 @@ public class Pliers : MonoBehaviour
|
|||
RaycastHit hit;
|
||||
bool raycast = Physics.Raycast(ray, out hit);
|
||||
if (raycast)
|
||||
{
|
||||
if (TooslManager.instance.currentTool != null && TooslManager.instance.currentTool.name == "°þÏßǯ")
|
||||
{
|
||||
if (MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name))
|
||||
{
|
||||
if (hit.collider.gameObject.name == "柜门_封印")
|
||||
{
|
||||
PliersObj.gameObject.transform.SetParent(null);
|
||||
StartCoroutine(PliersIE());
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(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(JunctionBoxRight());
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(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(JunctionBoxLeft());
|
||||
Debug.Log(hit.collider.gameObject.name);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(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);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(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);
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ public class TooslManager : MonoBehaviour
|
|||
public Transform PlayercameraTrans;
|
||||
|
||||
public static TooslManager instance;
|
||||
public GameObject currentTool = null;
|
||||
|
||||
/// <summary>
|
||||
/// 引用Ladder脚本
|
||||
|
|
|
|||
Loading…
Reference in New Issue