WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
陈向学 2024-09-04 16:02:51 +08:00
parent 8a181b9fe8 8eacd5c099
commit f80a72846c
6 changed files with 153 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Assets/Scenes/03_OfficeScene.unity
View File

@ -841,74 +841,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mobileController: {fileID: 919132148358585193}
--- !u!1 &2055950227
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2055950230}
- component: {fileID: 2055950229}
- component: {fileID: 2055950228}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2055950228
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2055950227}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &2055950229
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2055950227}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &2055950230
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2055950227}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2077977345
GameObject:
m_ObjectHideFlags: 0

6
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
View File

@ -202,4 +202,10 @@ public class Device_Cover : Device_Base
});
}
}
protected override void OnDestroy()
{
base.OnDestroy();
EventCenter.Instance.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, CheckTriggerShow);
}
}

4
Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
View File

@ -107,11 +107,13 @@ public class PermanentTriggerBase : MonoBehaviour
}
private void OnDestroy()
protected virtual void OnDestroy()
{
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
//private void OnDisable()
//{
// GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);

2
Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs
View File

@ -64,6 +64,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
if (GetControl<Toggle>("ImageF").isOn)
{
Debug.Log("判分后进行下一个面板");
GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid);
GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
}
break;
@ -71,6 +72,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
if (GetControl<Toggle>("ImageF").isOn)
{
Debug.Log("判分后进行下一个面板");
GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid);
GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
}
break;

135
Assets/StreamingAssets/realtimeStat.json Normal file
View File

@ -0,0 +1,135 @@
{
"systemID": 10002,
"schemeID": 1002,
"currentScore": 0.0,
"allSubScore": [
{
"index": 1,
"subProcessId": 1,
"currentScore": 0.0,
"isDone": false
},
{
"index": 2,
"subProcessId": 2,
"currentScore": 0.0,
"isDone": false
},
{
"index": 3,
"subProcessId": 3,
"currentScore": 0.0,
"isDone": false
},
{
"index": 4,
"subProcessId": 4,
"currentScore": 0.0,
"isDone": false
},
{
"index": 5,
"subProcessId": 5,
"currentScore": 0.0,
"isDone": false
},
{
"index": 6,
"subProcessId": 6,
"currentScore": 0.0,
"isDone": false
},
{
"index": 7,
"subProcessId": 7,
"currentScore": 0.0,
"isDone": false
},
{
"index": 8,
"subProcessId": 8,
"currentScore": 0.0,
"isDone": false
},
{
"index": 9,
"subProcessId": 9,
"currentScore": 0.0,
"isDone": false
},
{
"index": 10,
"subProcessId": 10,
"currentScore": 0.0,
"isDone": false
},
{
"index": 11,
"subProcessId": 11,
"currentScore": 0.0,
"isDone": false
},
{
"index": 12,
"subProcessId": 12,
"currentScore": 0.0,
"isDone": false
},
{
"index": 13,
"subProcessId": 13,
"currentScore": 0.0,
"isDone": false
},
{
"index": 14,
"subProcessId": 14,
"currentScore": 0.0,
"isDone": false
},
{
"index": 15,
"subProcessId": 15,
"currentScore": 0.0,
"isDone": false
},
{
"index": 16,
"subProcessId": 16,
"currentScore": 0.0,
"isDone": false
},
{
"index": 17,
"subProcessId": 17,
"currentScore": 0.0,
"isDone": false
},
{
"index": 18,
"subProcessId": 18,
"currentScore": 0.0,
"isDone": false
}
],
"allToolAndMaterial": [],
"allWear": [],
"sceneName": "03_OfficeScene",
"currentSceneTools": [],
"currentSceneTriggers": [
{
"triggerID": 5005,
"triggerName": "手机",
"selfPosInScene": {
"x": 0.0244421959,
"y": 0.885706842,
"z": -1.00569367
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
}
]
}

7
Assets/StreamingAssets/realtimeStat.json.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 61f30bf5680ef6b4590e9fca4c15f30e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: