diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e18348f --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +/.vsconfig +/10001.sln +/10001_YanCheng_Metrology.sln +/Assembly-CSharp.csproj +/Assembly-CSharp-Editor.csproj +/Library +/Logs +/Temp +/Assets/Template +/Assets/Template.meta +/.vs +/UniRx.csproj +/UniTask.Addressables.csproj +/UniTask.csproj +/UniTask.DOTween.csproj +/UniTask.Editor.csproj +/UniTask.Linq.csproj +/UniTask.TextMeshPro.csproj +/Assembly-CSharp-Editor-firstpass.csproj +/Assembly-CSharp-firstpass.csproj +/Sirenix.OdinInspector.Modules.UnityMathematics.csproj +/obj +/Assets/StreamingAssets/build_info.txt.meta +/Assets/StreamingAssets/build_info.txt +/10002_YanCheng_Metrology.sln +/10002 +/.idea diff --git a/Assets/Scripts/4001/Score_4001.cs b/Assets/Scripts/4001/Score_4001.cs index 8564d43..c005b12 100644 --- a/Assets/Scripts/4001/Score_4001.cs +++ b/Assets/Scripts/4001/Score_4001.cs @@ -360,40 +360,4 @@ public class Score_4001 : ScoreBase return false; } - - /// - /// 保存场景的Buffer信息 - /// - /// - public override string SaveSceneBufferList() - { - BufferTemp_4001 tmp = new BufferTemp_4001(); - 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); - return sceneInfo; - //throw new System.NotImplementedException(); - } - - /// - /// 加载场景的Buffer信息 - /// - public override void LoadSceneBufferList(string sceneInfo) - { - BufferTemp_4001 tmp = new BufferTemp_4001(); - 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/Scripts/Score_6001.cs b/Assets/Scripts/Score_6001.cs index 796a13c..6217516 100644 --- a/Assets/Scripts/Score_6001.cs +++ b/Assets/Scripts/Score_6001.cs @@ -363,40 +363,4 @@ public class Score_6001 : ScoreBase return false; } - - /// - /// 保存场景的Buffer信息 - /// - /// - public override string SaveSceneBufferList() - { - BufferTemp_6001 tmp = new BufferTemp_6001(); - 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); - return sceneInfo; - //throw new System.NotImplementedException(); - } - - /// - /// 加载场景的Buffer信息 - /// - public override void LoadSceneBufferList(string sceneInfo) - { - BufferTemp_6001 tmp = new BufferTemp_6001(); - 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/Score/ScoreBase.cs b/Assets/Template/Scripts/CXX/Score/ScoreBase.cs index b33c487..aacc66b 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; } - - /// - /// 璁板綍鐜板満鐜涓璼coreBase鐨勫悇椤筁ist缂撳瓨 - /// - public abstract string SaveSceneBufferList(); - /// - /// 杩樺師鐜板満鐜涓璼coreBase鐨勫悇椤筁ist缂撳瓨 - /// - 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 04c2a18..b6f7fbf 100644 --- a/Assets/Template/Scripts/CXX/Score/Score_2002.cs +++ b/Assets/Template/Scripts/CXX/Score/Score_2002.cs @@ -464,41 +464,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/Project/Manager/ReconnectMgr.cs b/Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs index 94a54ca..be9d883 100644 --- a/Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs +++ b/Assets/Template/Scripts/Project/Manager/ReconnectMgr.cs @@ -62,8 +62,6 @@ public class ReconnectMgr : SingletonMono sub.isDone = item.Value.isDone; UserExamStat.allSubScore.Add(sub); }; - //保存场景内独有信息 - UserExamStat.currentSceneBufferInfo = scoreBase.SaveSceneBufferList(); } //记录装备材料信息 UserExamStat.allToolAndMaterial.Clear(); @@ -306,7 +304,6 @@ public class ReconnectMgr : SingletonMono } } scoreBase.setCurrentScore(UserExamStat.currentScore); - scoreBase.LoadSceneBufferList(UserExamStat.currentSceneBufferInfo); } }); }