diff --git a/Assets/Scripts/Score_9001.cs b/Assets/Scripts/Score_9001.cs
index fdb38bf..8fff4e8 100644
--- a/Assets/Scripts/Score_9001.cs
+++ b/Assets/Scripts/Score_9001.cs
@@ -159,26 +159,4 @@ public class Score_9001 : ScoreBase
GameManager.NetMgr.sendSerData.remark = "";
GameManager.NetMgr.add();
}
-
-
-
- ///
- /// ?????List??,??????
- ///
- ///
- public override string SaveSceneBufferList()
- {
-
- return "";
- //throw new System.NotImplementedException();
- }
-
- ///
- /// ??????
- ///
- public override void LoadSceneBufferList(string sceneInfo)
- {
-
- //throw new System.NotImplementedException();
- }
}
diff --git a/Assets/Template/Scripts/CXX/Score/ScoreBase.cs b/Assets/Template/Scripts/CXX/Score/ScoreBase.cs
index 2663af8..3584d92 100644
--- a/Assets/Template/Scripts/CXX/Score/ScoreBase.cs
+++ b/Assets/Template/Scripts/CXX/Score/ScoreBase.cs
@@ -89,13 +89,4 @@ public abstract class ScoreBase : MonoBehaviour
{
this.currentScore = _score;
}
-
- ///
- /// 记录现场环境中scoreBase的各项List缓存
- ///
- public abstract string SaveSceneBufferList();
- ///
- /// 还原现场环境中scoreBase的各项List缓存
- ///
- public abstract void LoadSceneBufferList(string sceneInfo);
}
diff --git a/Assets/Template/Scripts/CXX/Score/Score_2002.cs b/Assets/Template/Scripts/CXX/Score/Score_2002.cs
index f624c9c..f677e05 100644
--- a/Assets/Template/Scripts/CXX/Score/Score_2002.cs
+++ b/Assets/Template/Scripts/CXX/Score/Score_2002.cs
@@ -463,41 +463,4 @@ public class Score_2002 : ScoreBase
return false;
}
-
- ///
- /// ?????List??,??????
- ///
- ///
- 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();
- }
-
- ///
- /// ??????
- ///
- public override void LoadSceneBufferList(string sceneInfo)
- {
- BufferTemp_2002 tmp = new BufferTemp_2002();
- tmp = JsonMapper.ToObject(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();
- }
}
diff --git a/Assets/Template/Scripts/CXX/StepState/StepState.cs b/Assets/Template/Scripts/CXX/StepState/StepState.cs
index 2d1da69..b51aa59 100644
--- a/Assets/Template/Scripts/CXX/StepState/StepState.cs
+++ b/Assets/Template/Scripts/CXX/StepState/StepState.cs
@@ -78,7 +78,7 @@ public abstract class StepState : MonoBehaviour
if (GameManager.RunModelMgr.SceneType != jumpSence)
{
//跳场景
- GameManager.UIMgr.ShowPanel(E_UI_Layer.System);
+ GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { panel.Init(); });
GameManager.ScenesMgr.LoadSceneAsyn(sname, () =>
{
Debug.Log("步骤场景:" + jumpSence.ToString());
diff --git a/Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs b/Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs
index b482e43..03e4736 100644
--- a/Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs
+++ b/Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs
@@ -77,8 +77,7 @@ public class ReconnectMgr : SingletonMono
sub.isDone = item.Value.isDone;
UserExamStat.allSubScore.Add(sub);
};
- //保存场景内独有信息
- UserExamStat.currentSceneOtherInfo = scoreBase.SaveSceneBufferList();
+
}
//记录装备材料信息
UserExamStat.allToolAndMaterial.Clear();
@@ -287,7 +286,6 @@ public class ReconnectMgr : SingletonMono
}
}
scoreBase.setCurrentScore(UserExamStat.currentScore);
- scoreBase.LoadSceneBufferList(UserExamStat.currentSceneOtherInfo);
}
});
}