From 6644caf8936bb05dbb2c15a7e82b3b2548eec2c5 Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Wed, 15 Jan 2025 09:33:29 +0800 Subject: [PATCH] 6001 --- Assets/Scenes/10006_6001_01_InitScene.unity | 97 ++++++------------- Assets/Scenes/10006_6001_03_OfficeScene.unity | 2 +- Assets/Scenes/10006_6001_05_LiveScene.unity | 30 ++++-- Assets/Scripts/Device_Control_6001.cs | 8 +- Assets/Scripts/Score_6001.cs | 4 +- Assets/Scripts/StepState_6001.cs | 15 ++- Assets/Scripts/UI_ConnectStation.cs | 56 ++++++----- Assets/StreamingAssets/Config/URLConfig.txt | 4 +- .../StreamingAssets/Config/URLConfig.txt.meta | 2 +- .../10006/10006_6001_低压台区采集故障.xml | 12 +-- 10 files changed, 116 insertions(+), 114 deletions(-) diff --git a/Assets/Scenes/10006_6001_01_InitScene.unity b/Assets/Scenes/10006_6001_01_InitScene.unity index 5298337..7f6371f 100644 --- a/Assets/Scenes/10006_6001_01_InitScene.unity +++ b/Assets/Scenes/10006_6001_01_InitScene.unity @@ -277,74 +277,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: systemId: 10006 ---- !u!1 &968199489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 968199492} - - component: {fileID: 968199491} - - component: {fileID: 968199490} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &968199490 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968199489} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &968199491 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968199489} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &968199492 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968199489} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + startSceneName: 03_OfficeScene --- !u!114 &1686064644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -406,6 +339,7 @@ MonoBehaviour: m_EditorClassIdentifier: systemId: 0 schemeId: 6001 + device_Control: {fileID: 0} --- !u!114 &1817104531410758845 MonoBehaviour: m_ObjectHideFlags: 0 @@ -464,6 +398,8 @@ GameObject: - component: {fileID: 1817104532591070030} - component: {fileID: 1817104532591070028} - component: {fileID: 1686064644} + - component: {fileID: 1817104532591070032} + - component: {fileID: 1817104532591070033} m_Layer: 0 m_Name: "\u6B65\u9AA4\u72B6\u6001" m_TagString: Untagged @@ -511,6 +447,31 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1817104532591070032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817104532591070025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a335acc154f7404494330a3524ad6b5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1817104532591070033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817104532591070025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50fb6698959dc034e865fdc90070cff0, type: 3} + m_Name: + m_EditorClassIdentifier: + isOnceAddFun: 0 --- !u!1001 &3218341170884851037 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/10006_6001_03_OfficeScene.unity b/Assets/Scenes/10006_6001_03_OfficeScene.unity index e33f0dd..5f0c06c 100644 --- a/Assets/Scenes/10006_6001_03_OfficeScene.unity +++ b/Assets/Scenes/10006_6001_03_OfficeScene.unity @@ -6242,7 +6242,7 @@ Transform: m_GameObject: {fileID: 6944469734800208480} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.000014, y: -104.49999, z: -47.90006} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1.007, z: 1.1637} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2089319124} diff --git a/Assets/Scenes/10006_6001_05_LiveScene.unity b/Assets/Scenes/10006_6001_05_LiveScene.unity index 7611ba1..97a8339 100644 --- a/Assets/Scenes/10006_6001_05_LiveScene.unity +++ b/Assets/Scenes/10006_6001_05_LiveScene.unity @@ -14957,8 +14957,7 @@ MonoBehaviour: triggerName: "NPC\u8D1F\u8D23\u4EBA" _highlight: {fileID: 0} npcSpeack: - - "\u7740\u88C5\u89C4\u8303\u3001\u4E2A\u4EBA\u9632\u62A4\u7528\u54C1\u5408\u683C\u9F50\u5907\u3001\u4EBA\u5458\u7CBE\u795E\u72B6\u6001\u826F\u597D\uFF0C\u53EF\u4EE5\u5F00\u5C55\u5DE5\u4F5C\uFF01" - - "\u4ECA\u5929\u5DE5\u4F5C\u5185\u5BB9\u662F\u76F4\u63A5\u63A5\u5165\u5F0F\u7535\u80FD\u8BA1\u91CF\u88C5\u7F6E\u8F6E\u6362\u4F5C\u4E1A\uFF0C\u5DE5\u4F5C\u5730\u70B9\u662Fxxx......" + - "\u7740\u88C5\u89C4\u8303\u3001\u4E2A\u4EBA\u9632\u62A4\u7528\u54C1\u5408\u683C\u9F50\u5907\u3001\u4EBA\u5458\u7CBE\u795E\u72B6\u6001\u826F\u597D\uFF0C\u53EF\u4EE5\u5F00\u5C55\u5DE5\u4F5C\uFF01\u4ECA\u5929\u5DE5\u4F5C\u5185\u5BB9\u662F\u73B0\u573A\u91C7\u96C6\u6545\u969C\u6392\u67E5\u53CA\u5904\u7406\u4F5C\u4E1A\uFF0C\u5DE5\u4F5C\u5730\u70B9\u662Fxxx\uFF0C\u5E26\u7535\u90E8\u5206\uFF0C\u8BA1\u91CF\u7BB1\u53CA\u91D1\u5C5E\u88F8\u9732\u90E8\u5206\u7B49\uFF0C\u73B0\u573A\u4F5C\u4E1A\u5B89\u5168\u63AA\u65BD\u6839\u636E\u5DE5\u4F5C\u7968\u6240\u5217\u5B89\u5168\u8981\u6C42\uFF0C\u843D\u5B9E\u5B89\u5168\u63AA\u65BD..." speackIndex: 0 spriteRenderer: {fileID: 680750130} animator: {fileID: 897986306} @@ -19404,8 +19403,8 @@ Transform: - {fileID: 1443161530} - {fileID: 723535377} - {fileID: 2591019038652623238} - - {fileID: 5008542128686470641} - {fileID: 1893456732} + - {fileID: 5008542128686470641} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} @@ -23026,7 +23025,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 332338951700092342, guid: 60338bcb7d853724fba468a37342705f, type: 3} propertyPath: m_Name - value: "\u91C7\u96C6\u5668" + value: "\u539F\u91C7\u96C6\u5668" + objectReference: {fileID: 0} + - target: {fileID: 332338951700092342, guid: 60338bcb7d853724fba468a37342705f, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 740431971001944585, guid: 60338bcb7d853724fba468a37342705f, type: 3} propertyPath: m_Name @@ -23034,7 +23037,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1141491156000722700, guid: 60338bcb7d853724fba468a37342705f, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1141491156000722700, guid: 60338bcb7d853724fba468a37342705f, type: 3} propertyPath: m_LocalPosition.x @@ -23092,6 +23095,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2734541677271557524, guid: 60338bcb7d853724fba468a37342705f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3621052572427822743, guid: 60338bcb7d853724fba468a37342705f, type: 3} + propertyPath: isInstalled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3621052572427822743, guid: 60338bcb7d853724fba468a37342705f, type: 3} propertyPath: installPos.x value: -0.1565018 @@ -25331,7 +25342,8 @@ MonoBehaviour: tMDTips: {fileID: 1180096483} triggerName: "\u6536\u56DE\u5DE5\u5177" npcCustomController: {fileID: 890581130} - playSpeack: "\u60A8\u597D\uFF0C\u6211\u662Fxx\u4F9B\u7535\u516C\u53F8\u5458\u5DE5\uFF0C\u8FD9\u662F\u6211\u7684\u5DE5\u4F5C\u8BC1\u3002\u73B0\u5728\u6211\u4EEC\u8981\u5BF9\u8D35\u6237\u66F4\u6362\u7535\u80FD\u8BA1\u91CF\u8868" + playSpeack: "\u60A8\u597D\uFF0C\u6211\u662F XX \u4F9B\u7535\u516C\u53F8\u7684\u5458\u5DE5\uFF0C\u8FD9\u662F\u6211\u7684\u5DE5\u4F5C\u8BC1\u3002\u4ECA\u5929\u6211\u4EEC\u5BF9\u8D35\u6237\u8FDB\u884C\u73B0\u573A\u91C7\u96C6\u6545\u969C\u6392\u67E5\u53CA\u5904\u7406\u5DE5\u4F5C\uFF0C\u4F5C\u4E1A\u65F6\u95F4\u4E3A + XX \u65F6\u81F3 XX \u65F6\uFF0C\u4F5C\u4E1A\u5B8C\u6210\u540E\u5C06\u518D\u6B21\u901A\u77E5\u60A8\u3002\u5728\u6B64\u671F\u95F4\u5BF9\u60A8\u9020\u6210\u7684\u4E0D\u4FBF\u6211\u4EEC\u6DF1\u611F\u62B1\u6B49\uFF0C\u611F\u8C22\u60A8\u7684\u7406\u89E3\u3002" device_Control: {fileID: 1584432037} jiaoYanYiPos: {fileID: 0} wanYongBiaoPos: {fileID: 0} @@ -27594,13 +27606,17 @@ PrefabInstance: propertyPath: m_Name value: "\u91C7\u96C6\u5668\u63D2\u5934" objectReference: {fileID: 0} + - target: {fileID: 2232743127493013942, guid: b39fdcc820528d14396a912f3d0daf97, type: 3} + propertyPath: m_Name + value: "------\u91C7\u96C6\u5668" + objectReference: {fileID: 0} - target: {fileID: 3791089853158224115, guid: b39fdcc820528d14396a912f3d0daf97, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 7351379683168670963, guid: b39fdcc820528d14396a912f3d0daf97, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7351379683168670963, guid: b39fdcc820528d14396a912f3d0daf97, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Device_Control_6001.cs b/Assets/Scripts/Device_Control_6001.cs index f973b5b..ec76218 100644 --- a/Assets/Scripts/Device_Control_6001.cs +++ b/Assets/Scripts/Device_Control_6001.cs @@ -180,9 +180,12 @@ public class Device_Control_6001 : Device_Control collector.MoveToInstall(); cur_collector.gameObject.SetActive(false); collector.gameObject.SetActive(true); - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_collectorTrigger.name, true) == 0) + collector.gameObject.name = "ɼ"; + collector.isInstalled = true; + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_collectorTrigger.triggerName, true) == 0) { - ScoreManager.instance.Check(device_collectorTrigger.name, "ɼװ"); + collector.plug.SetPlugColliderState(true); + ScoreManager.instance.Check(collector.gameObject.name, "ɼװ"); } }); }; @@ -438,5 +441,6 @@ public class Device_Control_6001 : Device_Control protected void OnDestroy() { EventCenter.Instance.RemoveEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, CheckTriggerShow); + GameManager.UIMgr.HidePanel();//HQB ʾϵ̨վİť } } diff --git a/Assets/Scripts/Score_6001.cs b/Assets/Scripts/Score_6001.cs index f5f5b5b..da9c088 100644 --- a/Assets/Scripts/Score_6001.cs +++ b/Assets/Scripts/Score_6001.cs @@ -179,12 +179,12 @@ public class Score_6001 : ScoreBase float tmp = 0; tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("ȫñ") ? 0.25f : 0); tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("") ? 0.25f : 0); - tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("Ե") ? 0.25f : 0); + tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("֯") ? 0.25f : 0); tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("Եѥ") ? 0.25f : 0); steps[5].SetScore(tmp); //鱳ǷЯ - string[] shoudleTools = new string[] { "ǯ", "Ե˿", "", "ȫñ", "", "Ե", "Եѥ", "֤", "װӡ", "ɼ" }; + string[] shoudleTools = new string[] { "ǯ", "Ե˿", "", "ȫñ", "", "֯", "Եѥ", "֤", "װӡ", "ɼ" }; float tmp2 = 1; shoudleTools.ToList().ForEach(a => { diff --git a/Assets/Scripts/StepState_6001.cs b/Assets/Scripts/StepState_6001.cs index df0ee99..751b6ba 100644 --- a/Assets/Scripts/StepState_6001.cs +++ b/Assets/Scripts/StepState_6001.cs @@ -78,6 +78,7 @@ public class StepState_6001 : StepState //ձ PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial(); TooRoomMannger.Instance.CheckWearByWearDic(); + TooRoomMannger.Instance.CreateTool(); //ɵһȥ߼ if (num == lastNum) { @@ -96,7 +97,7 @@ public class StepState_6001 : StepState //ѡȡ //װõ - List items = ToolAndmaterialMgr.Instance.GetItemInfoByName(new List { "ȫñ", "", "Ե", "Եѥ" }); + List items = TooRoomMannger.Instance.GetItemInfoByName(new List { "ȫñ", "", "֯", "Եѥ" }); items.ForEach(item => { PacksackBagMgr.Instance.AddOneToolOrMater(item.itemInfo); @@ -132,7 +133,7 @@ public class StepState_6001 : StepState //ձ PacksackBagMgr.Instance.ClearAllData(); //ɷװ - List items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ȫñ", "", "Ե", "Եѥ" }); + List items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ȫñ", "", "֯", "Եѥ" }); //뱳 items.ForEach(item => { @@ -141,7 +142,7 @@ public class StepState_6001 : StepState PacksackBagMgr.Instance.WearItemState(item, true); }); //ɹ - List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ǯ", "Ե˿", "", "ȫñ", "", "Ե", "Եѥ", "֤", "װӡ", "ɼ" }); + List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ǯ", "Ե˿", "", "ȫñ", "", "֯", "Եѥ", "֤", "װӡ", "ɼ" }); items2.ForEach(item => { PacksackBagMgr.Instance.AddOneToolOrMater(item); @@ -161,6 +162,14 @@ public class StepState_6001 : StepState //رչϵǼDZ GameManager.UIMgr.HidePanel(); + + //ԭɼ + device_Control.device_collectorTrigger.gameObject.SetActive(false); + device_Control.collector.gameObject.SetActive(true); + device_Control.collector.MoveToInstall(); + device_Control.collector.gameObject.name = "ԭɼ"; + device_Control.collector.plug.SetPlugState(true); + device_Control.collector.plug.SetPlugColliderState(true); } else if (num == 8) { diff --git a/Assets/Scripts/UI_ConnectStation.cs b/Assets/Scripts/UI_ConnectStation.cs index cbcc5f9..21a1f7f 100644 --- a/Assets/Scripts/UI_ConnectStation.cs +++ b/Assets/Scripts/UI_ConnectStation.cs @@ -8,17 +8,19 @@ public class UI_ConnectStation : BasePanel public string triggerName; //bool reinstalled = false; - Device_Control_6001 dc = null; + Device_Control dc = null; + public Device_Collector collector; + public Device_Sundries sundries; public override void ShowMe() { base.ShowMe(); - //GameManager.EventMgr.AddEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, TakeOutAndRetrievingTheTools_1); - //GameObject seal_2 = GameObject.Find("ܱӡ2"); - //ds = seal_2.GetComponent(); - //ds.cutAction += HighlightBtn; - dc = FindObjectOfType(); - dc.collector.plug.onPlugToClose += HighlightBtn; + //dc = FindObjectOfType(); + dc = FindObjectOfType(); + collector = dc.GetComponentInChildren(true); + sundries = dc.GetComponentInChildren(true); + + collector.plug.onPlugToClose += HighlightBtn; if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) { GetControl