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

Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
YangHua 2024-09-02 18:13:28 +08:00
parent 872aff659d daac6e5ba6
commit 93832af2ab
6 changed files with 67 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Resources/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.prefab
View File

@ -29793,7 +29793,7 @@ MonoBehaviour:
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_ScrollSensitivity: 8
m_Viewport: {fileID: 5092569755324715940}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 5092569753790709666}

44
Assets/Scenes/05_LiveScene.unity
View File

@ -312,8 +312,34 @@ PrefabInstance:
propertyPath: m_Name
value: "\u573A\u5730"
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2588606950836171102, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
--- !u!1 &159466234 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2588606950836171102, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
m_PrefabInstance: {fileID: 159466233}
m_PrefabAsset: {fileID: 0}
--- !u!65 &159466235
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 159466234}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 500, y: 761.86084, z: 1.2776842}
m_Center: {x: 0, y: 119.0697, z: -0.60743433}
--- !u!1 &192342789
GameObject:
m_ObjectHideFlags: 0
@ -6235,24 +6261,6 @@ Transform:
m_Father: {fileID: 1501092962}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -57, y: -68, z: 71}
--- !u!1 &1968113507 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -7138000903914520420, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
m_PrefabInstance: {fileID: 159466233}
m_PrefabAsset: {fileID: 0}
--- !u!65 &1968113511
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1968113507}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 500.00397, y: 519.947, z: 0.18053252}
m_Center: {x: -0.0019607544, y: 240.02661, z: 0.09030101}
--- !u!114 &1983640178 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541080334431885, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}

1
Assets/Scripts/CXX/Tools/Tool_TestPen.cs
View File

@ -75,6 +75,7 @@ public class Tool_TestPen : Tool_Base
{
if (!isMoving)
{
isFlicker = false;
base.ReBackHead();
}
}

4
Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs
View File

@ -38,12 +38,12 @@ public class D_SubProcessStep : I_Enter, I_Exit
string[] toolIdTemp = triggerID.Split(',');
for (int i = 0; i < toolIdTemp.Length; i++)
{
triggersName.Add(toolIdTemp[i].Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
triggersName.Add(toolIdTemp[i].Replace("\r\n", "").Replace("\n", "").Replace("\r", "").Trim());
}
}
else
{
triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", "").Trim());
}
ProcessManager.Instance.subProcessStepTriggerID = triggersName[0];
}

29
Assets/Scripts/Project/Manager/ProcessManager.cs
View File

@ -55,6 +55,11 @@ public class ProcessManager : BaseManager<ProcessManager>
/// </summary>
public int countDown = 0;
/// <summary>
/// 断线重连接自动保存倒计时
/// </summary>
public int countDown_AutoSave = 0;
/// <summary>
/// 实训/考试时长
/// </summary>
@ -75,6 +80,7 @@ public class ProcessManager : BaseManager<ProcessManager>
this.schemeID = id;
this.mode = mode;
coroutine = GameManager.MonoMgr.StartCoroutine(CountDown(countDown));
//coroutine = GameManager.MonoMgr.StartCoroutine(AutoSaveStat(countDown));//自动保存用户状态信息
d_Scheme = DataManager.Instance.GetSchemeData(id);
ReportManager.Instance.creport = DataManager.Instance.GetSchemeReport(id);
GameManager.ToolAndmaterialMgr.Init(d_Scheme.ToolOrMaterilOrDevice);
@ -301,6 +307,29 @@ public class ProcessManager : BaseManager<ProcessManager>
}
}
/// <summary>
/// 自动保存用户状态,
/// </summary>
/// <returns></returns>
private IEnumerator AutoSaveStat(int time)
{
countDown_AutoSave = time;
WaitForSeconds waitForSeconds = new WaitForSeconds(1);
while (countDown_AutoSave > 0)
{
yield return waitForSeconds;
countDown_AutoSave--;
Debug.Log("自动保存倒计时:" + countDown_AutoSave);
if (countDown_AutoSave <= 0)
{
ReconnectMgr.Instance.RealtimeStatWriter();//需要在GameManager里面初始化
Debug.Log("完成状态自动保存");
countDown_AutoSave = time;
}
}
}
/// <summary>
/// 结束
/// </summary>

9
Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs
View File

@ -95,7 +95,14 @@ public class UI_MainTitlePanel : BasePanel
case "closeBtn":
print("退出应用");
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System,
(panel) => { panel.Init("提示", "确定退出应用吗?", E_MessageType.Warning, () => { Application.Quit(); }); });
(panel) => { panel.Init("提示", "确定退出应用吗?", E_MessageType.Error, () =>
{
Debug.Log("退出");
Application.Quit();
}, () =>
{
Debug.Log("取消");
}); });
break;
case "upExamBtn":
print("交卷");