Merge branch 'feature/流程串通' into 'develop'

流程串通

See merge request aibis-dream/aibis-dream!150

Assets/Resources/SceneSO/PeipeiDay1.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
   m_Name: PeipeiDay1
   m_EditorClassIdentifier: 
-  nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2}
+  nextScene: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2}
   yarnProject: {fileID: 7545569452688597077, guid: 51b65ccc67faacd4bbf55f6fb0e4bd1e, type: 3}
   firstSceneName: ClinicScene
   isEndOfDay: 1

Assets/Resources/SceneSO/StoneDay1.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
   m_Name: StoneDay1
   m_EditorClassIdentifier: 
-  nextScene: {fileID: 0}
+  nextScene: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
   yarnProject: {fileID: 7545569452688597077, guid: 23b032aeb7a33db4a94b50b89fc530a7, type: 3}
   firstSceneName: ExpressFixScene
   isEndOfDay: 0

Assets/Resources/SceneSO/StoneDay2.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
   m_Name: StoneDay2
   m_EditorClassIdentifier: 
-  nextScene: {fileID: 0}
+  nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2}
   yarnProject: {fileID: 7545569452688597077, guid: c7bda76049631864984b10bc8201c815, type: 3}
   firstSceneName: ExpressFixScene
   isEndOfDay: 0

Assets/Scripts/MiniGame/Engine/EngineSystem.cs

@@ -38,6 +38,13 @@ namespace AibisDream
         }
 
         private void Start()
+        {
+            OnLoad();
+            
+            gameObject.SetActive(false);
+        }
+
+        private void OnLoad()
         {
             engineData = new EngineData(config.invalidTime);
             
@@ -45,9 +52,6 @@ namespace AibisDream
             _airGate.MoveToLevel(2);
             DialogController.Instance?.SetVariable("$curAirLevel", 2);
             engineData.UpdateAirLevel(1, config.maxLevel); // 内部档位从0计数，1就是2
-            
-            gameObject.SetActive(false);
-        
         }
 
         private void Update()
@@ -189,7 +193,7 @@ namespace AibisDream
 
             config = data;
             // 重置Data
-            Start();
+            OnLoad();
         }
 
         public override void Save()

Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json

@@ -1 +1 @@
-{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Lung","modulePicPath":"","modulePos":{"x":0.6,"y":1.85,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"Heart","modulePicPath":"","modulePos":{"x":-4.54,"y":0.92,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"GearBox","modulePicPath":"","modulePos":{"x":-3.259,"y":0.115,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"Liver","modulePicPath":"","modulePos":{"x":1.011,"y":-3.065,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"Stomach","modulePicPath":"","modulePos":{"x":-3.977,"y":-3.819,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false}]}
+{"hasHotErr":false,"moduleDataArray":[]}