diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/DatePanel.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/DatePanel.prefab index 44da28b5..da89799d 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/DatePanel.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/DatePanel.prefab @@ -5315,9 +5315,16 @@ MonoBehaviour: m_EditorClassIdentifier: calendarBtn: {fileID: 1373529959439983606} calendarPanel: {fileID: 1373529961266754347} + submitPanel: {fileID: 0} + preservationToggle: {fileID: 0} SchoolText: {fileID: 1373529961119931373} PlaceText: {fileID: 1373529960199526449} NumberText: {fileID: 1373529960558101403} + submitInputField: {fileID: 0} + submitText: {fileID: 0} + inputText: {fileID: 0} + dataText: {fileID: 0} + placeId: 0 --- !u!1 &1373529961001302078 GameObject: m_ObjectHideFlags: 0 diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel.prefab index 0acedc40..ae8a9e68 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel.prefab @@ -458,6 +458,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 8141397112577575397} + infoLables: [] --- !u!1 &2066200895938329627 GameObject: m_ObjectHideFlags: 0 @@ -1545,6 +1546,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 3293808261244687733} + infoLables: [] --- !u!1 &3293808261244687735 GameObject: m_ObjectHideFlags: 0 @@ -1896,6 +1898,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 0} + infoLables: [] --- !u!1 &3293808261331463479 GameObject: m_ObjectHideFlags: 0 @@ -2418,10 +2421,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -25} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808261568700422 CanvasRenderer: @@ -2466,10 +2469,10 @@ RectTransform: m_Father: {fileID: 3293808262786324324} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -225} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808261624699807 CanvasRenderer: @@ -2830,10 +2833,10 @@ RectTransform: m_Father: {fileID: 3293808262786324324} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -125} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808261795666373 CanvasRenderer: @@ -3836,10 +3839,10 @@ RectTransform: m_Father: {fileID: 3293808262786324324} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -175} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808262281408820 CanvasRenderer: @@ -4546,10 +4549,10 @@ RectTransform: m_Father: {fileID: 3293808262786324324} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -275} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808262527391690 CanvasRenderer: @@ -4594,10 +4597,10 @@ RectTransform: m_Father: {fileID: 3293808262786324324} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -25} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808262540453625 CanvasRenderer: @@ -4806,10 +4809,10 @@ RectTransform: m_Father: {fileID: 3293808262786324324} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -75} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808262623804958 CanvasRenderer: @@ -5044,6 +5047,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 3293808263187344053} + infoLables: [] --- !u!1 &3293808262938150161 GameObject: m_ObjectHideFlags: 0 @@ -5159,10 +5163,10 @@ RectTransform: m_Father: {fileID: 3293808262786324324} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -325} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293808263023517967 CanvasRenderer: @@ -5264,11 +5268,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf46134b79a6f364eb7461349a15ee8a, type: 3} m_Name: m_EditorClassIdentifier: - managerpanelText: {fileID: 3293808261331463477} - platesList: - - {fileID: 2725781287371340522} - - {fileID: 2178159237778104984} - - {fileID: 5060859429715450283} + panelScript: {fileID: 0} + managerPanelContent: {fileID: 0} + panelContent: {fileID: 0} + personnelPanelCount: {fileID: 0} + personItemPrefab: {fileID: 0} + scenePanelPrefab: {fileID: 0} + peopleWindowsPrefab: {fileID: 0} + personnelPanel: {fileID: 0} + jsonReader: {fileID: 0} + sceneText: {fileID: 0} + scrollRect: {fileID: 0} + panelInfo: {fileID: 0} + personnelPanel2: {fileID: 0} --- !u!1 &3293808263117346572 GameObject: m_ObjectHideFlags: 0 @@ -5464,6 +5476,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 0} + infoLables: [] --- !u!1 &3293808263187344055 GameObject: m_ObjectHideFlags: 0 @@ -6002,6 +6015,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 3482659771322643620} + infoLables: [] --- !u!1 &3575822303276207351 GameObject: m_ObjectHideFlags: 0 @@ -6300,6 +6314,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 5412834415171866463} + infoLables: [] --- !u!1 &4557689516136657086 GameObject: m_ObjectHideFlags: 0 @@ -6963,10 +6978,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -125} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7520072614101242106 CanvasRenderer: @@ -7011,10 +7026,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -325} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2709695126778353839 CanvasRenderer: @@ -7215,10 +7230,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -175} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &67093791899411757 CanvasRenderer: @@ -7263,10 +7278,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -375} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6654372742591664715 CanvasRenderer: @@ -7490,6 +7505,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 1927181478180116570} + infoLables: [] --- !u!1 &7095921200863908297 GameObject: m_ObjectHideFlags: 0 @@ -7632,6 +7648,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 2790463451544445578} + infoLables: [] --- !u!1 &7427859689325124430 GameObject: m_ObjectHideFlags: 0 @@ -7743,10 +7760,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -225} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9001030898732503125 CanvasRenderer: @@ -7898,6 +7915,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 2170343899489479093} + infoLables: [] --- !u!1 &7949303351631415369 GameObject: m_ObjectHideFlags: 0 @@ -8093,10 +8111,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -75} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3478851862178779543 CanvasRenderer: @@ -8141,10 +8159,10 @@ RectTransform: m_Father: {fileID: 3293808262460270773} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -275} - m_SizeDelta: {x: 450, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1571439531645825197 CanvasRenderer: @@ -8216,6 +8234,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: plateinfoText: {fileID: 4144486515543483236} + infoLables: [] --- !u!1 &8380021049477459646 GameObject: m_ObjectHideFlags: 0 diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel_Change.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel_Change.prefab index 28ddcb50..5f2e278f 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel_Change.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel_Change.prefab @@ -54,11 +54,16 @@ MonoBehaviour: panelScript: {fileID: 0} managerPanelContent: {fileID: 2430556421392339358} panelContent: {fileID: 7698950341139384484} + personnelPanelCount: {fileID: 0} personItemPrefab: {fileID: 8573669611114071623, guid: d1942d5ee12cbec428172f221efb03cc, type: 3} scenePanelPrefab: {fileID: 5432247953383937836, guid: a15ee694d5f79864d816998fae77116d, type: 3} + peopleWindowsPrefab: {fileID: 0} + personnelPanel: {fileID: 0} + jsonReader: {fileID: 0} sceneText: {fileID: 0} - nameText: {fileID: 0} - dutyText: {fileID: 0} + scrollRect: {fileID: 0} + panelInfo: {fileID: 0} + personnelPanel2: {fileID: 0} --- !u!1 &7698950340330308484 GameObject: m_ObjectHideFlags: 0 @@ -420,6 +425,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7698950341139384484} m_Modifications: + - target: {fileID: 6740850323187360111, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_SizeDelta.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6740850323496789725, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6740850323496789725, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6740850323496789725, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 6740850323496789725, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -64 + objectReference: {fileID: 0} - target: {fileID: 6740850324693622956, guid: a15ee694d5f79864d816998fae77116d, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -508,6 +533,22 @@ PrefabInstance: propertyPath: m_Name value: panel objectReference: {fileID: 0} + - target: {fileID: 6740850324834475489, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6740850324834475489, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6740850324834475489, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 6740850324834475489, guid: a15ee694d5f79864d816998fae77116d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -342.83502 + objectReference: {fileID: 0} - target: {fileID: 9016252888809016807, guid: a15ee694d5f79864d816998fae77116d, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab index 1b57c3cd..cd450286 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab @@ -638,7 +638,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840000955121081, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y - value: -186.5 + value: -109 objectReference: {fileID: 0} - target: {fileID: 1031840001001919873, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchorMax.y @@ -838,7 +838,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840001252021434, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y - value: -393.5 + value: -5 objectReference: {fileID: 0} - target: {fileID: 1031840001283713469, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchorMax.y @@ -1238,7 +1238,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840001516944377, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y - value: -164.5 + value: -93.5 objectReference: {fileID: 0} - target: {fileID: 1031840001537601792, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchorMax.y @@ -1406,7 +1406,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840002033716093, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y - value: -485.5 + value: -414.5 objectReference: {fileID: 0} - target: {fileID: 1031840002045599581, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchorMax.y @@ -1702,7 +1702,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840002269525488, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y - value: -393.5 + value: -93.5 objectReference: {fileID: 0} - target: {fileID: 1031840002311118596, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchorMax.y diff --git a/xiaofang/Assets/Res/gsj.meta b/xiaofang/Assets/Res/gsj.meta new file mode 100644 index 00000000..25021019 --- /dev/null +++ b/xiaofang/Assets/Res/gsj.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21fb5ffe455049444921974ad56d5b3b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: