huqibin
/
new_10007_YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

611、612 BUG

This commit is contained in:
huqibin 2025-04-23 15:14:16 +08:00
parent fdf568b902
commit 763358e95b
9 changed files with 56 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scripts/Player10007_7002.cs
View File

@ -22,8 +22,7 @@ public class Player10007_7002 : SingletonMono<Player10007_7002>
if (moveNum == 500)
{
isTour = true;
//Debug.LogError("巡视OK");
//GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("巡视场站", true) == 0)
{
ScoreManager.instance.Check("巡视场站", "");

21
Assets/Scripts/Score_7002.cs
View File

@ -212,25 +212,4 @@ public class Score_7002 : ScoreBase
// GameManager.NetMgr.add();
//}
/// <summary>
/// ?????List??,??????
/// </summary>
/// <exception cref="System.NotImplementedException"></exception>
public override string SaveSceneBufferList()
{
return "";
//throw new System.NotImplementedException();
}
/// <summary>
/// ??????
/// </summary>
public override void LoadSceneBufferList(string sceneInfo)
{
//throw new System.NotImplementedException();
}
}

5
Assets/Scripts/StepState_7002.cs
View File

@ -63,12 +63,16 @@ public class StepState_7002 : StepState
{
Score_7002.cdzIndex = 0;
Score_7002.ResetDic();
Player10007_7002.Instance.moveNum = 0;
Player10007_7002.Instance.isTour = false;
Player10007_7002.Instance.isNearCDZ = false;
}
else if (num == 5)
{
Score_7002.cdzIndex = 0;
Player10007_7002.Instance.moveNum = 500;
Player10007_7002.Instance.isTour = true;
}
else if (num == 6)
{
@ -85,6 +89,7 @@ public class StepState_7002 : StepState
else if (num == 7)
{
Score_7002.cdzIndex = 2;
Player10007_7002.Instance.isNearCDZ = true;
}
else if (num == 8)
{

6
Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs
View File

@ -136,6 +136,9 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel
}
print("Ìá½»");
GameManager.EventMgr.EventTrigger(Enum_EventType.Submit);
GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("撤离现场", true);
ScoreManager.instance.Check("撤离现场", null);
}
else
{
@ -143,8 +146,7 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel
}
//GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel_10007_7002>();
GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("撤离现场", true);
ScoreManager.instance.Check("撤离现场", null);
}
break;

9
Assets/Template/Scripts/CXX/Score/ScoreBase.cs
View File

@ -89,13 +89,4 @@ public abstract class ScoreBase : MonoBehaviour
{
this.currentScore = _score;
}
/// <summary>
/// 记录现场环境中scoreBase的各项List缓存
/// </summary>
public abstract string SaveSceneBufferList();
/// <summary>
/// 还原现场环境中scoreBase的各项List缓存
/// </summary>
public abstract void LoadSceneBufferList(string sceneInfo);
}

37
Assets/Template/Scripts/CXX/Score/Score_2002.cs
View File

@ -463,41 +463,4 @@ public class Score_2002 : ScoreBase
return false;
}
/// <summary>
/// ?????List??,??????
/// </summary>
/// <exception cref="System.NotImplementedException"></exception>
public override string SaveSceneBufferList()
{
BufferTemp_2002 tmp = new BufferTemp_2002();
tmp.TestPen3list = TestPen3list;
tmp.InSwitchCloseYDList = InSwitchCloseYDList;
tmp.InSwitchOpenYDList = InSwitchOpenYDList;
tmp.currentunInstallJieXian = currentunInstallJieXian;
tmp.currentInstallJieXian = currentInstallJieXian;
tmp.installCover = installCover;
tmp.currentInstallTestJieXian = currentInstallTestJieXian;
string sceneInfo = JsonConvert.SerializeObject(tmp, Formatting.Indented);
Debug.Log("==????:" + sceneInfo);
return sceneInfo;
//throw new System.NotImplementedException();
}
/// <summary>
/// ??????
/// </summary>
public override void LoadSceneBufferList(string sceneInfo)
{
BufferTemp_2002 tmp = new BufferTemp_2002();
tmp = JsonMapper.ToObject<BufferTemp_2002>(sceneInfo);
TestPen3list = tmp.TestPen3list;
InSwitchCloseYDList = tmp.InSwitchCloseYDList;
InSwitchOpenYDList = tmp.InSwitchOpenYDList;
currentunInstallJieXian = tmp.currentunInstallJieXian;
currentInstallJieXian = tmp.currentInstallJieXian;
installCover = tmp.installCover;
currentInstallTestJieXian = tmp.currentInstallTestJieXian;
//throw new System.NotImplementedException();
}
}

7
Assets/Template/Scripts/HQB/SecurityCheck.cs
View File

@ -32,6 +32,9 @@ public class SecurityCheck : MonoBehaviour
[HideInInspector]
public string debugStr = "";
#if UNITY_EDITOR
public bool ForcePassBlack = true;
#endif
// 获取文件哈希值的方法
@ -122,6 +125,10 @@ public class SecurityCheck : MonoBehaviour
}
result = true;
check_finish = true;
#if UNITY_EDITOR
if (ForcePassBlack)
result = true;
#endif
}
private void Awake()

76
Assets/Template/Scripts/Project/Manager/GameManager.cs
View File

@ -262,8 +262,8 @@ public class GameManager : SingletonAutoMono<GameManager>
}
IEnumerator AsyncLoadScene(bool isReset = false)
{
while(SecurityCheck.instance.check_finish)
{
while (SecurityCheck.instance.check_finish)
yield return null;
if (SecurityCheck.instance.result)
{
@ -272,14 +272,18 @@ public class GameManager : SingletonAutoMono<GameManager>
}
else
{
UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System,
(p) => { p.Init("错误", "安全检查失败，请重新启动应用！", E_MessageType.Warning,
() => {
(p) =>
{
p.Init("错误", "安全检查失败，请重新启动应用！", E_MessageType.Warning,
() =>
{
UnityEngine.Debug.Log("爆了！");
Application.Quit();
}); });
Application.Quit();
});
});
}
}
@ -294,9 +298,9 @@ public class GameManager : SingletonAutoMono<GameManager>
{
ResetStateAndEvent();
}
UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) => { panel.Init(); });
//GameManager.NetMgr.operationType = "3";
if (GameManager.NetMgr.operationType == "3")
{
var modeType = E_ModeType.Exam;
@ -304,7 +308,7 @@ public class GameManager : SingletonAutoMono<GameManager>
GameManager.RunModelMgr.schemeID = 7002;
GameManager.ProcessMgr.Init(GameManager.RunModelMgr.schemeID);
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
GameManager.NetMgr.init_getSerData(() =>
{
@ -312,18 +316,14 @@ public class GameManager : SingletonAutoMono<GameManager>
{
GameManager.ScenesMgr.LoadSceneAsyn($"{GameManager.Instance.systemId}_{GameManager.RunModelMgr.schemeID}_03_OfficeScene", () =>
{
//UIMgr.HidePanel<UI_LoadingPanel>();
//GameManager.UIMgr.HidePanel<UI_SelectModePanel>();
GameManager.UIMgr.HidePanel<UI_BGPanel>();
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.8f);
UIMgr.HidePanel<UI_LoadingPanel>();
//if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
GameManager.RunModelMgr.startTime = DateTime.Now;
GameManager.NetMgr.setTime();
UnityEngine.Debug.Log("开始记时：" + GameManager.RunModelMgr.startTime.ToString());
}
GameManager.RunModelMgr.startTime = DateTime.Now;
GameManager.NetMgr.setTime();
UnityEngine.Debug.Log("开始记时：" + GameManager.RunModelMgr.startTime.ToString());
});
return;
}
@ -365,11 +365,9 @@ public class GameManager : SingletonAutoMono<GameManager>
int processID = d_SubProcesses[id].processId;
int subProcessID = d_SubProcesses[id].id;
int subProcessStepID = d_SubProcesses[id].subProcessStepes[0].id;
//UIMgr.HidePanel<UI_LoadingPanel>();
//GameManager.UIMgr.HidePanel<UI_SelectModePanel>();
GameManager.UIMgr.HidePanel<UI_BGPanel>();
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
//if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.8f);
if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
GameManager.RunModelMgr.startTime = DateTime.Now;
GameManager.NetMgr.setTime();
@ -405,7 +403,7 @@ public class GameManager : SingletonAutoMono<GameManager>
{
//修改本地文件
NetMgr.SaveInfo("1");
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.8f);
});
}
StartCoroutine(AsyncSecurityCheck());
@ -473,19 +471,19 @@ public class GameManager : SingletonAutoMono<GameManager>
});
}
//#if UNITY_EDITOR
// void OnGUI()
// {
// // 设置GUI样式（可选）
// GUIStyle style = new GUIStyle();
// style.fontSize = 20;
// style.normal.textColor = Color.red;
//#if UNITY_EDITOR
// void OnGUI()
// {
// // 设置GUI样式（可选）
// GUIStyle style = new GUIStyle();
// style.fontSize = 20;
// style.normal.textColor = Color.red;
// // 在屏幕上绘制调试信息
// GUILayout.Label(" " + SecurityCheck.instance.debugStr + "\n " + SecurityCheck.instance.read + "/" + SecurityCheck.instance.total, style);
// GUILayout.Label(" " + debugInfo, style);
// }
//#endif
// // 在屏幕上绘制调试信息
// GUILayout.Label(" " + SecurityCheck.instance.debugStr + "\n " + SecurityCheck.instance.read + "/" + SecurityCheck.instance.total, style);
// GUILayout.Label(" " + debugInfo, style);
// }
//#endif
/// <summary>
/// 学习调用
@ -537,7 +535,7 @@ public class GameManager : SingletonAutoMono<GameManager>
public async void OnRefreshToken()
{
while (true)
{
{
UnityEngine.Debug.Log("NetMgr.Get(tokenUrl)11111111");
await NetMgr.Get(tokenUrl);
UnityEngine.Debug.Log("NetMgr.Get(tokenUrl)");

4
Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs
View File

@ -78,7 +78,7 @@ public class ReconnectMgr : SingletonMono<ReconnectMgr>
UserExamStat.allSubScore.Add(sub);
};
//保存场景内独有信息
UserExamStat.currentSceneOtherInfo = scoreBase.SaveSceneBufferList();
//UserExamStat.currentSceneOtherInfo = scoreBase.SaveSceneBufferList();
}
//记录装备材料信息
UserExamStat.allToolAndMaterial.Clear();
@ -287,7 +287,7 @@ public class ReconnectMgr : SingletonMono<ReconnectMgr>
}
}
scoreBase.setCurrentScore(UserExamStat.currentScore);
scoreBase.LoadSceneBufferList(UserExamStat.currentSceneOtherInfo);
//scoreBase.LoadSceneBufferList(UserExamStat.currentSceneOtherInfo);
}
});
}