This commit is contained in:
parent
6cafd313bf
commit
731a39f598
File diff suppressed because one or more lines are too long
|
|
@ -480,7 +480,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6053353591068959239, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6205274277508386708, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
||||
propertyPath: m_Interactable
|
||||
|
|
|
|||
|
|
@ -691,7 +691,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &37459385
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4547,7 +4547,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &232502823
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10886,6 +10886,16 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 576451065}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &580889073 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3708782976203021668, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
m_PrefabInstance: {fileID: 601364440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &580889074 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7224413821687438680, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
m_PrefabInstance: {fileID: 601364440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &587729409
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -11273,6 +11283,14 @@ PrefabInstance:
|
|||
propertyPath: m_BlendShapeWeights.Array.data[0]
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2215587378946524487, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
propertyPath: rmsCount
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2215587378946524487, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2525010733065056853, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "JZQ_\u87BA\u4E1D0033"
|
||||
|
|
@ -11341,6 +11359,10 @@ PrefabInstance:
|
|||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5928593624261139865, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "JZQ_\u87BA\u4E1D001111"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5944189480022684345, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
propertyPath: m_Size.z
|
||||
value: 2.8502007
|
||||
|
|
@ -11619,7 +11641,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 601364443}
|
||||
- target: {fileID: 8219398056856457891, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8322912254063910965, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -19007,7 +19029,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1007924651
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -24590,7 +24612,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1338581660
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -27308,7 +27330,9 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: "JZQ_\u87BA\u4E1D002"
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 6106586016319151649, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3}
|
||||
- {fileID: 409149086400793276, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 7063737413586441568, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3}
|
||||
|
|
@ -28560,7 +28584,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1521115506
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -30875,7 +30899,9 @@ PrefabInstance:
|
|||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 6531800841171930545, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
- {fileID: 1776596074669799527, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 2637669136938480617, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
m_AddedGameObjects:
|
||||
|
|
@ -31109,6 +31135,10 @@ PrefabInstance:
|
|||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6304423774548493137, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463771665152150607, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.276
|
||||
|
|
@ -31161,7 +31191,9 @@ PrefabInstance:
|
|||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 9162861833251026421, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
|
||||
- {fileID: 6304423774548493137, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 7463771665152150607, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
|
||||
|
|
@ -32325,7 +32357,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1710852922
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -33500,7 +33532,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!65 &1771853379
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -35978,6 +36010,8 @@ MonoBehaviour:
|
|||
- {fileID: 1485260150}
|
||||
- {fileID: 1485260147}
|
||||
- {fileID: 1485260146}
|
||||
"\u900F\u660E\u76D6\u5B50\u5C01\u5370\u78B0\u649ER": {fileID: 580889074}
|
||||
"\u900F\u660E\u76D6\u5B50\u5C01\u5370\u78B0\u649EL": {fileID: 580889073}
|
||||
--- !u!1 &1904368290
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -122404,7 +122438,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 4
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!33 &978902392900454235
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -231337,7 +231371,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!23 &3654899718848195363
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -231592,7 +231626,9 @@ PrefabInstance:
|
|||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 2686997889178815087, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
- {fileID: 4555496241924987327, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 580240823696719808, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
m_AddedGameObjects:
|
||||
|
|
@ -232207,7 +232243,7 @@ Transform:
|
|||
m_GameObject: {fileID: 6121626523908351179}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 2.5564217e-18, y: -0.70707405, z: -0.00000008428979, w: 0.70713955}
|
||||
m_LocalPosition: {x: 304.82, y: 1.56, z: 163.177}
|
||||
m_LocalPosition: {x: 340.79, y: 1.56, z: 167.01}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace DefaultNamespace.ProcessMode
|
|||
|
||||
public AnimationProcess CurrentProcess => _processes[_currentMode.ToString()];
|
||||
|
||||
public delegate void CompleteEventHandler(float score);
|
||||
public delegate void CompleteEventHandler(int score);
|
||||
|
||||
public delegate void UIEventHandler();
|
||||
|
||||
|
|
@ -403,7 +403,7 @@ namespace DefaultNamespace.ProcessMode
|
|||
/// <summary>
|
||||
/// 计算总分
|
||||
/// </summary>
|
||||
private float CalculateTotalScore()
|
||||
private int CalculateTotalScore()
|
||||
{
|
||||
float totalScore = 0;
|
||||
foreach (var step in _processes[_currentMode.ToString()].Steps)
|
||||
|
|
@ -420,7 +420,7 @@ namespace DefaultNamespace.ProcessMode
|
|||
}
|
||||
|
||||
Debug.Log($"总分: {totalScore}");
|
||||
return totalScore;
|
||||
return (int)totalScore;
|
||||
}
|
||||
|
||||
public void OnCreate(object createParam)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
"actions": [
|
||||
{
|
||||
"description": "领取工器具及仪器设备",
|
||||
"score": 0,
|
||||
"score": 30,
|
||||
"isSequential": false,
|
||||
"targetObjects": [
|
||||
"螺丝刀",
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
"JZQ_螺丝004",
|
||||
"JZQ_螺丝0044",
|
||||
"JZQ_螺丝006",
|
||||
"JZQ_螺丝007"
|
||||
"JZQ_螺丝005"
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
@ -250,14 +250,10 @@
|
|||
"isSequential": false,
|
||||
"targetObjects": [
|
||||
"JZQ_螺丝001",
|
||||
"JZQ_螺丝0011",
|
||||
"JZQ_螺丝002",
|
||||
"JZQ_螺丝0022",
|
||||
"JZQ_螺丝003",
|
||||
"JZQ_螺丝0033",
|
||||
"JZQ_螺丝004",
|
||||
"JZQ_螺丝0044",
|
||||
"JZQ_螺丝005",
|
||||
"JZQ_螺丝007",
|
||||
"JZQ_螺丝006"
|
||||
]
|
||||
}
|
||||
|
|
@ -346,19 +342,6 @@
|
|||
]
|
||||
}
|
||||
]
|
||||
},{
|
||||
"stepDescription": "加装封印",
|
||||
"score": 1.4,
|
||||
"actions": [
|
||||
{
|
||||
"description": "加装封印",
|
||||
"score": 0,
|
||||
"isSequential": false,
|
||||
"targetObjects": [
|
||||
"电柜门封印box碰撞"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
2024-06-14 15:04:12#'sxfz://;lyht,1,18,userId,username,token,90;/'|
|
||||
2024-06-14 15:04:12#'sxfz://;lyht,0,18,userId,username,token,90;/'|
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -70,6 +70,13 @@ public class concentrator : MonoBehaviour
|
|||
public GameObject[] ScrewObj;
|
||||
|
||||
|
||||
|
||||
public GameObject ͸Ã÷¸Ç×Ó·âÓ¡ÅöײR;
|
||||
public GameObject ͸Ã÷¸Ç×Ó·âÓ¡ÅöײL;
|
||||
|
||||
|
||||
|
||||
|
||||
bool isplaying = true;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
|
|
@ -93,6 +100,13 @@ public class concentrator : MonoBehaviour
|
|||
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;
|
||||
|
||||
|
||||
}
|
||||
for (int i = 0; i < ScrewObj.Length; i++)
|
||||
{
|
||||
|
|
@ -135,7 +149,7 @@ public class concentrator : MonoBehaviour
|
|||
// Debug.Log("ËùÓÐÂÝË¿¶¼ÏÔʾ");
|
||||
}
|
||||
|
||||
if (hit.collider.gameObject.name == "JZQ_ÂÝË¿007s")
|
||||
if (hit.collider.gameObject.name == "JZQ_ÂÝË¿007")
|
||||
{
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public class CompleteOverComponent : MonoBehaviour
|
|||
|
||||
}
|
||||
|
||||
private void CompleteEvent(float score)
|
||||
private void CompleteEvent(int score)
|
||||
{
|
||||
overGame.SetActive(true);
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ public class Fieldobservation : MonoBehaviour
|
|||
//isbox = false;
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
|
||||
guimenbox.GetComponent<BoxCollider>().enabled = true;
|
||||
guimen.GetComponent<BoxCollider>().enabled = true;
|
||||
|
||||
}
|
||||
if (hit.collider.gameObject.name == "±äµçÏä_ÃÅ")
|
||||
|
|
@ -126,6 +126,9 @@ public class Fieldobservation : MonoBehaviour
|
|||
isbox = false;
|
||||
// }
|
||||
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
|
||||
|
||||
|
||||
guimenbox.GetComponent<BoxCollider>().enabled = true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue