Compare commits

..

No commits in common. "cecf3989b32b0af7f38460f59b52d6181f7d3aee" and "13f74a2139c17614c859088f45e7b7b6757da59f" have entirely different histories.

5 changed files with 117 additions and 195 deletions

View File

@ -1,35 +1,29 @@
[ [
{ {
"ID": "9002", "ID": 9003,
"Name": "40002", "Name": 40001,
"Type": "2", "Type": 1,
"IncidentType": "5001", "IncidentType": "5001|5002|5003",
"ObjList": "7001,7002,7003|7001,7003|7001,7002,7003", "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003",
"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", "AreaList": "1000|1001|1002|1003",
"Storeroom": "1011", "Storeroom": 1011
"ConfigText": "10039|10040|10039",
"": ""
}, },
{ {
"ID": "9003", "ID": 9004,
"Name": "40001", "Name": 40001,
"Type": "1", "Type": 2,
"IncidentType": "5001", "IncidentType": "5001|5002|5003",
"ObjList": "7001,7002,7003|7001,7003|7001,7002,7003", "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003",
"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", "AreaList": "1000|1001|1002|1003",
"Storeroom": "1011", "Storeroom": 1011
"ConfigText": "20034|20035|20036",
"": ""
}, },
{ {
"ID": "9004", "ID": 9005,
"Name": "40003", "Name": 40001,
"Type": "3", "Type": 3,
"IncidentType": "5002", "IncidentType": "5001|5002|5003",
"ObjList": "7001,7002,7003|7001,7003|7001,7002,7003", "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003",
"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", "AreaList": "1000|1001|1002|1003",
"Storeroom": "1011", "Storeroom": 1011
"ConfigText": "10039|10040|10039",
"": ""
} }
] ]

View File

@ -1506,7 +1506,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1373529960772387234, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} - target: {fileID: 1373529960772387234, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1373529960772387234, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} - target: {fileID: 1373529960772387234, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -2094,7 +2094,7 @@ RectTransform:
- {fileID: 1435623614} - {fileID: 1435623614}
- {fileID: 1120226610} - {fileID: 1120226610}
m_Father: {fileID: 1592869153} m_Father: {fileID: 1592869153}
m_RootOrder: 2 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -2144,7 +2144,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &618256459 --- !u!224 &618256459
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2160,6 +2160,7 @@ RectTransform:
- {fileID: 1447785401} - {fileID: 1447785401}
- {fileID: 1071409071} - {fileID: 1071409071}
- {fileID: 1695373861} - {fileID: 1695373861}
- {fileID: 865567721}
- {fileID: 1600693806} - {fileID: 1600693806}
- {fileID: 1799705459} - {fileID: 1799705459}
- {fileID: 5745561351747452950} - {fileID: 5745561351747452950}
@ -2249,7 +2250,6 @@ MonoBehaviour:
name: name:
duty: duty:
scene: scene:
dutyId: 0
peopleList: [] peopleList: []
managerPanel1: {fileID: 617308873} managerPanel1: {fileID: 617308873}
jsonReader1: {fileID: 1417128757} jsonReader1: {fileID: 1417128757}
@ -2389,7 +2389,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7468736064578063281, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} m_CorrespondingSourceObject: {fileID: 7468736064578063281, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
m_PrefabInstance: {fileID: 865567720} m_PrefabInstance: {fileID: 865567720}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 925248153} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@ -2827,7 +2827,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3746951257987266719, guid: e55a074b1a79a9045804c800bf094463, type: 3} - target: {fileID: 3746951257987266719, guid: e55a074b1a79a9045804c800bf094463, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3746951257987266719, guid: e55a074b1a79a9045804c800bf094463, type: 3} - target: {fileID: 3746951257987266719, guid: e55a074b1a79a9045804c800bf094463, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -3201,17 +3201,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 710084128} m_GameObject: {fileID: 710084128}
m_CullTransparentMesh: 1 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 --- !u!1 &756609117 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 6740850324693622957, guid: a15ee694d5f79864d816998fae77116d, type: 3} m_CorrespondingSourceObject: {fileID: 6740850324693622957, guid: a15ee694d5f79864d816998fae77116d, type: 3}
@ -4031,7 +4020,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3} - target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3} - target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -5681,7 +5670,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 1592869153} m_TransformParent: {fileID: 618256459}
m_Modifications: m_Modifications:
- target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: title propertyPath: title
@ -5703,14 +5692,6 @@ PrefabInstance:
propertyPath: jsonReader propertyPath: jsonReader
value: value:
objectReference: {fileID: 1417128757} 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} - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: eventInfoList.Array.size propertyPath: eventInfoList.Array.size
value: 2 value: 2
@ -5753,7 +5734,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -5773,11 +5754,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 1834
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 1577.3936
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -5797,15 +5778,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -5833,39 +5814,39 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063766935916, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063766935916, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y
value: 1 value: 1
objectReference: {fileID: 0} 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} - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 543.7644
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063812420174, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -55
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 917
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736063881909988, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -53.335
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064052287372, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064052287372, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: eventName propertyPath: eventName
@ -5957,63 +5938,59 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064179597218, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064179597218, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 206 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064179597218, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064179597218, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 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} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 917
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064250338014, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -343.34674
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 334.1322
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064349377664, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -55
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 753.3966
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064407837105, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -55
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736064424568481, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736064424568481, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@ -6075,65 +6052,61 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0} 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} - target: {fileID: 7468736064580561832, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: -1792
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 917 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -829.36597 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065055436939, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065055436939, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 124.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065668749935, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -55
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 917
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -1328.051
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065685524839, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} - target: {fileID: 7468736065685524839, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
@ -6163,10 +6136,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7468736065691790204, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
--- !u!224 &865567721 stripped --- !u!224 &865567721 stripped
@ -6258,11 +6227,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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 --- !u!114 &981298357 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1373529960062900723, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} m_CorrespondingSourceObject: {fileID: 1373529960062900723, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3}
@ -8802,7 +8766,6 @@ MonoBehaviour:
sceneJsonFile: {fileID: 4900000, guid: 06c09fd1c8b0a0a45951a1065189d922, type: 3} sceneJsonFile: {fileID: 4900000, guid: 06c09fd1c8b0a0a45951a1065189d922, type: 3}
incidentSiteJosnFile: {fileID: 4900000, guid: 1efa4372b10d4294199638c49173ff4c, type: 3} incidentSiteJosnFile: {fileID: 4900000, guid: 1efa4372b10d4294199638c49173ff4c, type: 3}
NPCJosnFile: {fileID: 4900000, guid: 41009f009f0718647a782c7e1aec97dd, type: 3} NPCJosnFile: {fileID: 4900000, guid: 41009f009f0718647a782c7e1aec97dd, type: 3}
LanguageJsonFile: {fileID: 4900000, guid: 62a41129c4663ee41a06274114d28feb, type: 3}
--- !u!4 &1417128758 --- !u!4 &1417128758
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -9595,7 +9558,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 618256459} - {fileID: 618256459}
- {fileID: 865567721}
- {fileID: 617308872} - {fileID: 617308872}
- {fileID: 856136727} - {fileID: 856136727}
- {fileID: 7318934474885050404} - {fileID: 7318934474885050404}
@ -9639,7 +9601,7 @@ RectTransform:
- {fileID: 780163546} - {fileID: 780163546}
- {fileID: 545401391} - {fileID: 545401391}
m_Father: {fileID: 618256459} m_Father: {fileID: 618256459}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
@ -10798,7 +10760,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4764228630805767485, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} - target: {fileID: 4764228630805767485, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4764228630805767485, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} - target: {fileID: 4764228630805767485, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -13150,7 +13112,7 @@ RectTransform:
- {fileID: 5745561351907901266} - {fileID: 5745561351907901266}
- {fileID: 5745561351270762316} - {fileID: 5745561351270762316}
m_Father: {fileID: 618256459} m_Father: {fileID: 618256459}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -13902,7 +13864,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 7318934475829044879} - {fileID: 7318934475829044879}
m_Father: {fileID: 1592869153} m_Father: {fileID: 1592869153}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}

View File

@ -1,6 +1,5 @@
using UnityEngine; using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine.UI;
public class JSONReader : MonoBehaviour public class JSONReader : MonoBehaviour
{ {
@ -34,10 +33,10 @@ public class JSONReader : MonoBehaviour
NPCDictionary = NPCParseJSON(incidentSiteJosnFile.text); NPCDictionary = NPCParseJSON(incidentSiteJosnFile.text);
LanguageDictionary = LanguageParseJSON(LanguageJsonFile.text); LanguageDictionary = LanguageParseJSON(LanguageJsonFile.text);
GetLanguageByID(20008); GetLanguageByID(20008);
foreach (var npc in sceneDictionary) foreach (var npc in LanguageDictionary)
{ {
// Debug.Log(npc.Value.ID); //Debug.Log(npc.Value.Text);
//Debug.Log(npc.Value.Name); //Debug.Log(npc.Value.Note);
} }
GetNpcDataByID(8001); GetNpcDataByID(8001);
} }
@ -168,7 +167,6 @@ public class JSONReader : MonoBehaviour
} }
} }
//根据id获取数据
public Language GetLanguageByID(int id) public Language GetLanguageByID(int id)
{ {
Language info = null; Language info = null;
@ -191,34 +189,6 @@ public class JSONReader : MonoBehaviour
} }
return null; // 如果没有找到符合条件的语言数据,返回 null 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 数组 // 帮助类,用于解析 JSON 数组

View File

@ -354,6 +354,12 @@ public class Panel : MonoBehaviour
arrangeText.text = "[" + name + "]µ£ÈÎ[" + duty + "],λÓÚ[" + scene + "]"; arrangeText.text = "[" + name + "]µ£ÈÎ[" + duty + "],λÓÚ[" + scene + "]";
} }
public void SetUIText(Text text,int id)
{
Language languageinfo = jsonReader1.GetLanguageByID(id);
text.text = languageinfo.Text;
}
//ɸѡ //ɸѡ
public void SetInputFile() public void SetInputFile()
{ {

View File

@ -21,18 +21,16 @@ public class SelectScenePanel : MonoBehaviour
public GameObject scoolSelectBtn;//学校选择按钮 public GameObject scoolSelectBtn;//学校选择按钮
public GameObject schoolChoiceLable;//学校选择界面 public GameObject schoolChoiceLable;//学校选择界面
public GameObject eventChoiceLable;//事件选择界面 public GameObject eventChoiceLable;//事件选择界面
public Button randomEventBtn;//随机事件按钮
[Header("请选择演练的场景")] public Text text20008;
public Text title;//界面标题 public Text title;//界面标题
public List<SchoolInfo> schoolInfoList = new List<SchoolInfo>();//学校信息 public List<SchoolInfo> schoolInfoList = new List<SchoolInfo>();//学校信息
public List<EventInfo> eventInfoList = new List<EventInfo>();//事件信息 public List<EventInfo> eventInfoList = new List<EventInfo>();//事件信息
public List<SceneItem> sceneItemList = new List<SceneItem>();//场景信息 public List<SceneItem> sceneItemList = new List<SceneItem>();//场景信息
public List<Toggle> difficultyList = new List<Toggle>();//游戏难度 public List<Toggle> difficultyList = new List<Toggle>();//游戏难度
public Button continueBtn; public Button continueBtn;
public List<Toggle> scenetoggleList = new List<Toggle>(); public List<Toggle> toggleList = new List<Toggle>();
public List<Toggle> schooltoggleList=new List<Toggle>();
public List<Toggle> eventToggleList = new List<Toggle>(); public List<Toggle> eventToggleList = new List<Toggle>();
public List<Toggle> evnetsceneList = new List<Toggle>(); public List<Toggle> evnetsceneList = new List<Toggle>();
public Toggle[] schooltoggleList;
public ToggleGroup toggleGroup; public ToggleGroup toggleGroup;
[Header("数据")] [Header("数据")]
@ -45,12 +43,10 @@ public class SelectScenePanel : MonoBehaviour
public string eventName; public string eventName;
public string difficulty; public string difficulty;
public string isBuy; public string isBuy;
public bool isSure;//判断是否点击了提交按钮
public JSONReader jsonReader; public JSONReader jsonReader;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
schoolChoiceLable.gameObject.SetActive(true); schoolChoiceLable.gameObject.SetActive(true);
eventChoiceLable.gameObject.SetActive(false); eventChoiceLable.gameObject.SetActive(false);
InstantiateScenePrefab(); InstantiateScenePrefab();
@ -58,9 +54,10 @@ public class SelectScenePanel : MonoBehaviour
InstantiateIncidentPrefab(2001); InstantiateIncidentPrefab(2001);
SetEventToggleOpenorClose(eventInfoList); SetEventToggleOpenorClose(eventInfoList);
continueBtn.onClick.AddListener(OnClickContinueBtn); continueBtn.onClick.AddListener(OnClickContinueBtn);
SetFirstChoise(scenetoggleList); SetFirstChoise(toggleList);
SetToggleOpenorClose(sceneItemList);//未购买无法选择 SetToggleOpenorClose(sceneItemList);//未购买无法选择
SetScloolToggleOpenorClose(schoolInfoList); SetScloolToggleOpenorClose(schoolInfoList);
} }
// Update is called once per frame // Update is called once per frame
@ -110,13 +107,12 @@ public class SelectScenePanel : MonoBehaviour
if (toggle != null) if (toggle != null)
{ {
toggle.group = sceneGroup; toggle.group = sceneGroup;
scenetoggleList.Add(toggle); // 使用 Add() 方法添加 Toggle 元素 toggleList[index++] = toggle;
sceneItemList.Add(item); sceneItemList.Add(item);
} }
} }
} }
//动态加载学校选择预制体(这里面的东西需要判断场景的Id来加载对应的场景) //动态加载学校选择预制体(这里面的东西需要判断场景的Id来加载对应的场景)
public void InstantiateSchoolPrefab() public void InstantiateSchoolPrefab()
{ {
@ -226,8 +222,6 @@ public class SelectScenePanel : MonoBehaviour
//学校选择 //学校选择
public void SelectSchoolBtn() public void SelectSchoolBtn()
{
if(isSure)
{ {
SchoolInfo gameObject = GetComponentInChildren<SchoolInfo>(); SchoolInfo gameObject = GetComponentInChildren<SchoolInfo>();
foreach (SchoolInfo item in schoolInfoList) foreach (SchoolInfo item in schoolInfoList)
@ -242,13 +236,10 @@ public class SelectScenePanel : MonoBehaviour
Debug.Log("###############1:" + this.schoolId); Debug.Log("###############1:" + this.schoolId);
Debug.Log("###############2:" + this.schoolName); Debug.Log("###############2:" + this.schoolName);
} }
}
//场景选择 //场景选择
public void SelectSceneBtn() public void SelectSceneBtn()
{ {
if(isSure)
{}
bool sceneSelected = false; // 检查是否有场景被选择 bool sceneSelected = false; // 检查是否有场景被选择
foreach (SceneItem item in sceneItemList) foreach (SceneItem item in sceneItemList)
{ {
@ -265,7 +256,6 @@ public class SelectScenePanel : MonoBehaviour
} }
Debug.Log("---------------" + this.scnenId); Debug.Log("---------------" + this.scnenId);
Debug.Log("###############3:" + this.schoolId); Debug.Log("###############3:" + this.schoolId);
//IsClick(); //IsClick();
} }
@ -308,8 +298,9 @@ public class SelectScenePanel : MonoBehaviour
//随机事件 //随机事件
public void OnRandomEventClick() public void OnRandomEventClick()
{ {
// 随机选择一个事件 // 随机选择一个事件
if (eventInfoList.Count > 1) if (eventInfoList.Count > 0)
{ {
int randomIndex = Random.Range(0, eventInfoList.Count); int randomIndex = Random.Range(0, eventInfoList.Count);
@ -337,7 +328,6 @@ public class SelectScenePanel : MonoBehaviour
} }
else else
{ {
randomEventBtn.gameObject.SetActive(false);
Debug.LogWarning("事件列表为空!"); Debug.LogWarning("事件列表为空!");
} }
} }
@ -360,7 +350,7 @@ public class SelectScenePanel : MonoBehaviour
//继续按钮,点击后上传数据 //继续按钮,点击后上传数据
public void OnClickContinueBtn() public void OnClickContinueBtn()
{ {
// 调用 IsClick 检查是否选中学校和场景 //IsClick(); // 调用 IsClick 检查是否选中学校和场景
foreach (Transform child in sceneList) foreach (Transform child in sceneList)
{ {
child.gameObject.SetActive(false); child.gameObject.SetActive(false);
@ -368,7 +358,7 @@ public class SelectScenePanel : MonoBehaviour
SelectSchoolBtn(); SelectSchoolBtn();
SelectSceneBtn(); SelectSceneBtn();
InstantiateEventPrefab(this.scnenId); InstantiateEventPrefab(this.scnenId);
SetFirstChoise(scenetoggleList); SetFirstChoise(toggleList);
if (continueBtn.interactable) if (continueBtn.interactable)
{ {
schoolChoiceLable.gameObject.SetActive(false); schoolChoiceLable.gameObject.SetActive(false);
@ -416,9 +406,9 @@ public class SelectScenePanel : MonoBehaviour
bool anyToggleSelected = false; bool anyToggleSelected = false;
// 检查场景选择 // 检查场景选择
foreach (Toggle toggle in scenetoggleList) foreach (Toggle toggle in toggleList)
{ {
Debug.Log("++++++++++++++++++++++++=" + scenetoggleList.Count()); Debug.Log("++++++++++++++++++++++++=" + toggleList.Count());
if (toggle.isOn) if (toggle.isOn)
{ {
anyToggleSelected = true; anyToggleSelected = true;