From effc389683d1f4cea4affabecd4bc5b30f97019c Mon Sep 17 00:00:00 2001 From: lq <3298408835@qq.com> Date: Thu, 5 Dec 2024 15:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9C=BA=E6=99=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=B2=E8=81=94=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Resources/JsonAsset/Scene.json | 42 ++-- xiaofang/Assets/Scenes/Schedule_03.unity | 202 +++++++++++------- .../Assets/Script/JSONReader/JSONReader.cs | 38 +++- xiaofang/Assets/Script/Scheduled_03/Panel.cs | 6 - .../Script/UI/PanelUI/SelectScenePanel.cs | 76 ++++--- 5 files changed, 221 insertions(+), 143 deletions(-) diff --git a/xiaofang/Assets/Resources/JsonAsset/Scene.json b/xiaofang/Assets/Resources/JsonAsset/Scene.json index ed43f0ef..a5e670c6 100644 --- a/xiaofang/Assets/Resources/JsonAsset/Scene.json +++ b/xiaofang/Assets/Resources/JsonAsset/Scene.json @@ -1,29 +1,35 @@ [ { - "ID": 9003, - "Name": 40001, - "Type": 1, - "IncidentType": "5001|5002|5003", + "ID": "9002", + "Name": "40002", + "Type": "2", + "IncidentType": "5001", "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003", - "AreaList": "1000|1001|1002|1003", - "Storeroom": 1011 + "AreaList": "1012|1013|1014|1015|1017|1018|1019|1020|1021|1022|1023|1024|1025|1026|1027|1028|1029|1030|1076|1031|1032|1033|1034|1036|1037|1038|1039|1040|1041|1077|1078|1079|1080|1081|1082|1083|1084|1085|1086", + "Storeroom": "1011", + "ConfigText": "10039|10040|10039", + "": "" }, { - "ID": 9004, - "Name": 40001, - "Type": 2, - "IncidentType": "5001|5002|5003", + "ID": "9003", + "Name": "40001", + "Type": "1", + "IncidentType": "5001", "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003", - "AreaList": "1000|1001|1002|1003", - "Storeroom": 1011 + "AreaList": "1012|1013|1014|1015|1017|1018|1019|1020|1021|1022|1023|1024|1025|1026|1027|1028|1029|1030|1076|1031|1032|1033|1034|1036|1037|1038|1039|1040|1041|1077|1078|1079|1080|1081|1082|1083|1084|1085|1086", + "Storeroom": "1011", + "ConfigText": "20034|20035|20036", + "": "" }, { - "ID": 9005, - "Name": 40001, - "Type": 3, - "IncidentType": "5001|5002|5003", + "ID": "9004", + "Name": "40003", + "Type": "3", + "IncidentType": "5002", "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003", - "AreaList": "1000|1001|1002|1003", - "Storeroom": 1011 + "AreaList": "1012|1013|1014|1015|1017|1018|1019|1020|1021|1022|1023|1024|1025|1026|1027|1028|1029|1030|1076|1031|1032|1033|1034|1036|1037|1038|1039|1040|1041|1077|1078|1079|1080|1081|1082|1083|1084|1085|1086", + "Storeroom": "1011", + "ConfigText": "10039|10040|10039", + "": "" } ] \ No newline at end of file diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity index 38e64527..29af2cd8 100644 --- a/xiaofang/Assets/Scenes/Schedule_03.unity +++ b/xiaofang/Assets/Scenes/Schedule_03.unity @@ -1506,7 +1506,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1373529960772387234, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1373529960772387234, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} propertyPath: m_AnchorMax.x @@ -2094,7 +2094,7 @@ RectTransform: - {fileID: 1435623614} - {fileID: 1120226610} m_Father: {fileID: 1592869153} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2144,7 +2144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &618256459 RectTransform: m_ObjectHideFlags: 0 @@ -2160,7 +2160,6 @@ RectTransform: - {fileID: 1447785401} - {fileID: 1071409071} - {fileID: 1695373861} - - {fileID: 865567721} - {fileID: 1600693806} - {fileID: 1799705459} - {fileID: 5745561351747452950} @@ -2250,6 +2249,7 @@ MonoBehaviour: name: duty: scene: + dutyId: 0 peopleList: [] managerPanel1: {fileID: 617308873} jsonReader1: {fileID: 1417128757} @@ -2389,7 +2389,7 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7468736064578063281, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} m_PrefabInstance: {fileID: 865567720} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 925248153} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -2827,7 +2827,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3746951257987266719, guid: e55a074b1a79a9045804c800bf094463, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3746951257987266719, guid: e55a074b1a79a9045804c800bf094463, type: 3} propertyPath: m_AnchorMax.x @@ -3201,6 +3201,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 710084128} m_CullTransparentMesh: 1 +--- !u!114 &739013960 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7468736065661051226, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + m_PrefabInstance: {fileID: 865567720} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &756609117 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6740850324693622957, guid: a15ee694d5f79864d816998fae77116d, type: 3} @@ -4020,7 +4031,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchorMax.x @@ -5670,7 +5681,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 618256459} + m_TransformParent: {fileID: 1592869153} m_Modifications: - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: title @@ -5692,6 +5703,14 @@ PrefabInstance: propertyPath: jsonReader value: objectReference: {fileID: 1417128757} + - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: randomEventBtn + value: + objectReference: {fileID: 739013960} + - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: scoolSelectBtn + value: + objectReference: {fileID: 925248153} - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: eventInfoList.Array.size value: 2 @@ -5734,7 +5753,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMax.x @@ -5754,11 +5773,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_SizeDelta.x - value: 1834 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_SizeDelta.y - value: 1577.3936 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_LocalPosition.x @@ -5778,15 +5797,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x @@ -5814,39 +5833,39 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7468736063766935916, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x - value: 543.7644 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.y - value: -55 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x - value: 917 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.y - value: -53.335 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064052287372, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: eventName @@ -5938,59 +5957,63 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7468736064179597218, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 206 objectReference: {fileID: 0} - target: {fileID: 7468736064179597218, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7468736064179597219, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x - value: 917 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.y - value: -343.34674 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x - value: 334.1322 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.y - value: -55 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x - value: 753.3966 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.y - value: -55 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736064424568481, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -6052,61 +6075,65 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 7468736064578063281, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_Text + value: "\u8BF7\u9009\u62E9\u6F14\u7EC3\u7684\u573A\u666F" + objectReference: {fileID: 0} - target: {fileID: 7468736064580561832, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_SizeDelta.x - value: -1792 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7468736065055436939, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 124.5 - objectReference: {fileID: 0} - - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -55 - objectReference: {fileID: 0} - - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.x value: 917 objectReference: {fileID: 0} + - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -829.36597 + objectReference: {fileID: 0} + - target: {fileID: 7468736065055436939, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_AnchoredPosition.y - value: -1328.051 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7468736065685524839, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: m_IsActive @@ -6136,6 +6163,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7468736065691790204, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} --- !u!224 &865567721 stripped @@ -6227,6 +6258,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &925248153 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7468736064578063283, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + m_PrefabInstance: {fileID: 865567720} + m_PrefabAsset: {fileID: 0} --- !u!114 &981298357 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1373529960062900723, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} @@ -8766,6 +8802,7 @@ MonoBehaviour: sceneJsonFile: {fileID: 4900000, guid: 06c09fd1c8b0a0a45951a1065189d922, type: 3} incidentSiteJosnFile: {fileID: 4900000, guid: 1efa4372b10d4294199638c49173ff4c, type: 3} NPCJosnFile: {fileID: 4900000, guid: 41009f009f0718647a782c7e1aec97dd, type: 3} + LanguageJsonFile: {fileID: 4900000, guid: 62a41129c4663ee41a06274114d28feb, type: 3} --- !u!4 &1417128758 Transform: m_ObjectHideFlags: 0 @@ -9558,6 +9595,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 618256459} + - {fileID: 865567721} - {fileID: 617308872} - {fileID: 856136727} - {fileID: 7318934474885050404} @@ -9601,7 +9639,7 @@ RectTransform: - {fileID: 780163546} - {fileID: 545401391} m_Father: {fileID: 618256459} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -10760,7 +10798,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4764228630805767485, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4764228630805767485, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} propertyPath: m_AnchorMax.x @@ -13112,7 +13150,7 @@ RectTransform: - {fileID: 5745561351907901266} - {fileID: 5745561351270762316} m_Father: {fileID: 618256459} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13864,7 +13902,7 @@ RectTransform: m_Children: - {fileID: 7318934475829044879} m_Father: {fileID: 1592869153} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/xiaofang/Assets/Script/JSONReader/JSONReader.cs b/xiaofang/Assets/Script/JSONReader/JSONReader.cs index dc2a9f82..6e3d27ac 100644 --- a/xiaofang/Assets/Script/JSONReader/JSONReader.cs +++ b/xiaofang/Assets/Script/JSONReader/JSONReader.cs @@ -1,5 +1,6 @@ using UnityEngine; using System.Collections.Generic; +using UnityEngine.UI; public class JSONReader : MonoBehaviour { @@ -31,12 +32,12 @@ public class JSONReader : MonoBehaviour sceneDictionary = SceneParseJSON(sceneJsonFile.text); incidentSiteDictionary = IncidentSiteParseJSON(incidentSiteJosnFile.text); NPCDictionary = NPCParseJSON(incidentSiteJosnFile.text); - LanguageDictionary = LanguageParseJSON(LanguageJsonFile.text); + LanguageDictionary = LanguageParseJSON(LanguageJsonFile.text); GetLanguageByID(20008); - foreach (var npc in LanguageDictionary) + foreach (var npc in sceneDictionary) { - //Debug.Log(npc.Value.Text); - //Debug.Log(npc.Value.Note); + // Debug.Log(npc.Value.ID); + //Debug.Log(npc.Value.Name); } GetNpcDataByID(8001); } @@ -167,6 +168,7 @@ public class JSONReader : MonoBehaviour } } + //根据id获取数据 public Language GetLanguageByID(int id) { Language info = null; @@ -189,6 +191,34 @@ public class JSONReader : MonoBehaviour } return null; // 如果没有找到符合条件的语言数据，返回 null } + + public SceneData GetSceneById(int id) + { + SceneData info = null; + if (sceneDictionary.TryGetValue(id, out info)) + { + return info; + } + else return null; + } + + public EventData GetEvenById(int id) + { + EventData info = null; + if (eventDictionary.TryGetValue(id, out info)) + { + return info; + } + else return null; + } + + //设置UI文本的方法 + public void SetUIText(Text text, int id) + { + Language languageinfo = GetLanguageByID(id); + text.text = languageinfo.Text; + } + } // 帮助类，用于解析 JSON 数组 diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs index 4bc8c0e3..ae2f5dca 100644 --- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs +++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs @@ -354,12 +354,6 @@ public class Panel : MonoBehaviour arrangeText.text = "[" + name + "]担任[" + duty + "],位于[" + scene + "]"; } - public void SetUIText(Text text,int id) - { - Language languageinfo = jsonReader1.GetLanguageByID(id); - text.text = languageinfo.Text; - } - //筛选 public void SetInputFile() { diff --git a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs index 72780f66..b7fad817 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs @@ -21,16 +21,18 @@ public class SelectScenePanel : MonoBehaviour public GameObject scoolSelectBtn;//学校选择按钮 public GameObject schoolChoiceLable;//学校选择界面 public GameObject eventChoiceLable;//事件选择界面 + public Button randomEventBtn;//随机事件按钮 + [Header("请选择演练的场景")] public Text text20008; public Text title;//界面标题 public List schoolInfoList = new List();//学校信息 public List eventInfoList = new List();//事件信息 public List sceneItemList = new List();//场景信息 public List difficultyList = new List();//游戏难度 public Button continueBtn; - public List toggleList = new List(); + public List scenetoggleList = new List(); + public List schooltoggleList=new List(); public List eventToggleList = new List(); public List evnetsceneList = new List(); - public Toggle[] schooltoggleList; public ToggleGroup toggleGroup; [Header("数据")] @@ -43,10 +45,12 @@ public class SelectScenePanel : MonoBehaviour public string eventName; public string difficulty; public string isBuy; + public bool isSure;//判断是否点击了提交按钮 public JSONReader jsonReader; // Start is called before the first frame update void Start() { + schoolChoiceLable.gameObject.SetActive(true); eventChoiceLable.gameObject.SetActive(false); InstantiateScenePrefab(); @@ -54,10 +58,9 @@ public class SelectScenePanel : MonoBehaviour InstantiateIncidentPrefab(2001); SetEventToggleOpenorClose(eventInfoList); continueBtn.onClick.AddListener(OnClickContinueBtn); - SetFirstChoise(toggleList); + SetFirstChoise(scenetoggleList); SetToggleOpenorClose(sceneItemList);//未购买无法选择 SetScloolToggleOpenorClose(schoolInfoList); - } // Update is called once per frame @@ -107,12 +110,13 @@ public class SelectScenePanel : MonoBehaviour if (toggle != null) { toggle.group = sceneGroup; - toggleList[index++] = toggle; + scenetoggleList.Add(toggle); // 使用 Add() 方法添加 Toggle 元素 sceneItemList.Add(item); } } } + //动态加载学校选择预制体(这里面的东西需要判断场景的Id来加载对应的场景) public void InstantiateSchoolPrefab() { @@ -223,39 +227,45 @@ public class SelectScenePanel : MonoBehaviour //学校选择 public void SelectSchoolBtn() { - SchoolInfo gameObject = GetComponentInChildren(); - foreach (SchoolInfo item in schoolInfoList) + if(isSure) { - if (item.gameObject.transform.GetComponent().isOn) + SchoolInfo gameObject = GetComponentInChildren(); + foreach (SchoolInfo item in schoolInfoList) { - this.schoolId = item.schoolId; - this.schoolName = item.schoolName.text; - title.text = item.schoolName.text; + if (item.gameObject.transform.GetComponent().isOn) + { + this.schoolId = item.schoolId; + this.schoolName = item.schoolName.text; + title.text = item.schoolName.text; + } } + Debug.Log("###############1:" + this.schoolId); + Debug.Log("###############2:" + this.schoolName); } - Debug.Log("###############1:" + this.schoolId); - Debug.Log("###############2:" + this.schoolName); } //场景选择 public void SelectSceneBtn() { - bool sceneSelected = false; // 检查是否有场景被选择 - foreach (SceneItem item in sceneItemList) - { - // 检查当前的 Toggle 是否被选中 - if (item.gameObject.transform.GetComponent().isOn) + if(isSure) + {} + bool sceneSelected = false; // 检查是否有场景被选择 + foreach (SceneItem item in sceneItemList) { - // 设置场景名称 - this.sceneName = item.sceneName.text; // 获取 Text 组件的文本 - this.scnenId = item.sceneId; - createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.sceneId.ToString(); - sceneSelected = true; - break; // 找到选中的场景后退出循环 + // 检查当前的 Toggle 是否被选中 + if (item.gameObject.transform.GetComponent().isOn) + { + // 设置场景名称 + this.sceneName = item.sceneName.text; // 获取 Text 组件的文本 + this.scnenId = item.sceneId; + createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.sceneId.ToString(); + sceneSelected = true; + break; // 找到选中的场景后退出循环 + } } - } - Debug.Log("---------------" + this.scnenId); - Debug.Log("###############3:" + this.schoolId); + Debug.Log("---------------" + this.scnenId); + Debug.Log("###############3:" + this.schoolId); + //IsClick(); } @@ -298,9 +308,8 @@ public class SelectScenePanel : MonoBehaviour //随机事件 public void OnRandomEventClick() { - // 随机选择一个事件 - if (eventInfoList.Count > 0) + if (eventInfoList.Count > 1) { int randomIndex = Random.Range(0, eventInfoList.Count); @@ -328,6 +337,7 @@ public class SelectScenePanel : MonoBehaviour } else { + randomEventBtn.gameObject.SetActive(false); Debug.LogWarning("事件列表为空！"); } } @@ -350,7 +360,7 @@ public class SelectScenePanel : MonoBehaviour //继续按钮，点击后上传数据 public void OnClickContinueBtn() { - //IsClick(); // 调用 IsClick 检查是否选中学校和场景 + // 调用 IsClick 检查是否选中学校和场景 foreach (Transform child in sceneList) { child.gameObject.SetActive(false); @@ -358,7 +368,7 @@ public class SelectScenePanel : MonoBehaviour SelectSchoolBtn(); SelectSceneBtn(); InstantiateEventPrefab(this.scnenId); - SetFirstChoise(toggleList); + SetFirstChoise(scenetoggleList); if (continueBtn.interactable) { schoolChoiceLable.gameObject.SetActive(false); @@ -406,9 +416,9 @@ public class SelectScenePanel : MonoBehaviour bool anyToggleSelected = false; // 检查场景选择 - foreach (Toggle toggle in toggleList) + foreach (Toggle toggle in scenetoggleList) { - Debug.Log("++++++++++++++++++++++++=" + toggleList.Count()); + Debug.Log("++++++++++++++++++++++++=" + scenetoggleList.Count()); if (toggle.isOn) { anyToggleSelected = true;