diff --git a/Assets/Scripts/Device_Control_6001.cs b/Assets/Scripts/Device_Control_6001.cs index 19dc13d..3d60401 100644 --- a/Assets/Scripts/Device_Control_6001.cs +++ b/Assets/Scripts/Device_Control_6001.cs @@ -77,6 +77,12 @@ public class Device_Control_6001 : Device_Control public DeviceTrigger door_seal_trigger; #endregion + private void Start() + { + Init(); + base.hasInit = true; + } + private void Awake() { //设置控制脚本 diff --git a/Assets/Scripts/Score_6001.cs b/Assets/Scripts/Score_6001.cs index 190f5b8..b63dc53 100644 --- a/Assets/Scripts/Score_6001.cs +++ b/Assets/Scripts/Score_6001.cs @@ -25,7 +25,7 @@ public class Score_6001 : ScoreBase /// /// 现场场景中的特殊物体控制 /// - private Device_Control_6001 device_Control; + private new Device_Control_6001 device_Control; /// /// 初始化,有配置用配置的分数,没有使用默认的分数 @@ -77,6 +77,7 @@ public class Score_6001 : ScoreBase public override void SetDeviceControl(Device_Control device_Control) { + base.SetDeviceControl(device_Control); this.device_Control = (Device_Control_6001)device_Control; } /// @@ -365,14 +366,14 @@ public class Score_6001 : ScoreBase /// 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; + 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(); diff --git a/Assets/StreamingAssets/FaultOptions.json b/Assets/StreamingAssets/FaultOptions.json index 0cd40ac..0374d2c 100644 --- a/Assets/StreamingAssets/FaultOptions.json +++ b/Assets/StreamingAssets/FaultOptions.json @@ -1,4 +1,39 @@ { - "FaultDevice": "", - "dataFaultType": [ ] + "FaultDevice": "鐢佃兘琛", + "FaultDeviceShow": false, + "FaultTypeShow": false, + "FaultSituationL1Show": false, + "FaultSituationL2Show": true, + "dataFaultType": [ + { + "name": "111", + "dataFaultSituationL1": [ + { + "name": "2222", + "dataFaultSituationL2": [ + { + "L2name": "寮傚父閲囨牱", + "L2Limitation": [] + }, + { + "L2name": "璁¢噺寮傚父", + "L2Limitation": [] + }, + { + "L2name": "绐冪數", + "L2Limitation": [] + }, + { + "L2name": "鎶鏈嚎鎹", + "L2Limitation": [] + }, + { + "L2name": "妗f寮傚父", + "L2Limitation": [] + } + ] + } + ] + } + ] } \ No newline at end of file