diff --git a/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab b/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab index 758e5de..e3f5097 100644 --- a/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab @@ -49,7 +49,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222758155768901986 CanvasRenderer: @@ -341,7 +341,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224709044277005608 RectTransform: m_ObjectHideFlags: 0 @@ -2150,7 +2150,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1038330277984410 @@ -9640,7 +9640,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1147573066069678 @@ -10452,7 +10452,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -11184,7 +11184,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224097225428564506 RectTransform: m_ObjectHideFlags: 0 @@ -14412,7 +14412,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224713926563121488 RectTransform: m_ObjectHideFlags: 0 @@ -17204,7 +17204,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1274814270674766 @@ -24147,7 +24147,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1386982704532146 @@ -36158,7 +36158,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224784263106987334 RectTransform: m_ObjectHideFlags: 0 @@ -52182,8 +52182,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 102, y: -29} - m_SizeDelta: {x: -400.1, y: 58} + m_AnchoredPosition: {x: 94.9, y: -29} + m_SizeDelta: {x: -414.3, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222082679505926996 CanvasRenderer: @@ -53680,7 +53680,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1892908203762944 @@ -54243,7 +54243,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1902923099662780 @@ -58757,7 +58757,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114663442895378086 @@ -61417,11 +61417,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224435228627855546} m_Modifications: - - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, - type: 3} - propertyPath: m_Name - value: ExitButton - objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_LocalPosition.x @@ -61490,12 +61485,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} @@ -61527,6 +61522,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, + type: 3} + propertyPath: m_Name + value: ExitButton + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3} --- !u!224 &2748383912879035654 stripped diff --git a/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhongDuiPanel.prefab b/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhongDuiPanel.prefab index 10c5f10..2dc30d7 100644 --- a/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhongDuiPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/BaseCommander/ZhongDuiPanel.prefab @@ -5238,7 +5238,7 @@ RectTransform: m_Father: {fileID: 224160323440425554} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.00000011920929, y: 0} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.9999998, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -7947,7 +7947,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224428925532001522 RectTransform: m_ObjectHideFlags: 0 @@ -12613,7 +12613,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224687916594037266 RectTransform: m_ObjectHideFlags: 0 @@ -12632,7 +12632,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -423} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1215146668243906 @@ -12669,7 +12669,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1215486536981890 @@ -29410,7 +29410,7 @@ MonoBehaviour: m_HandleRect: {fileID: 224461881785065250} m_Direction: 0 m_Value: 1 - m_Size: 0.9999999 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -32324,7 +32324,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222735462613638686 CanvasRenderer: @@ -33637,7 +33637,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1521098284254472 @@ -38822,7 +38822,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1601700387365834 @@ -43178,7 +43178,7 @@ RectTransform: m_Father: {fileID: 224461436117643274} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.00000017881393} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -45194,7 +45194,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1720772112265668 @@ -47712,7 +47712,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1754660219105538 @@ -51891,7 +51891,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0.0000068230656} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &114380219486165904 @@ -51911,7 +51911,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -53735,7 +53735,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224583573117956420 RectTransform: m_ObjectHideFlags: 0 @@ -53754,7 +53754,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -329} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1858163403839386 @@ -56248,7 +56248,7 @@ MonoBehaviour: m_HandleRect: {fileID: 224803206743584928} m_Direction: 2 m_Value: 1 - m_Size: 1 + m_Size: 0.9999998 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -59826,7 +59826,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224277315872346708 RectTransform: m_ObjectHideFlags: 0 @@ -59845,7 +59845,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -470} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1956983590616252 @@ -61565,7 +61565,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114537266044272976 @@ -62163,11 +62163,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224609257569891380} m_Modifications: - - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, - type: 3} - propertyPath: m_Name - value: ExitButton - objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_LocalPosition.x @@ -62236,12 +62231,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} @@ -62273,6 +62268,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, + type: 3} + propertyPath: m_Name + value: ExitButton + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3} --- !u!224 &1227157753397391204 stripped diff --git a/Assets/Prefabs/DongYouLiQing/CanMou/CanMouPanel.prefab b/Assets/Prefabs/DongYouLiQing/CanMou/CanMouPanel.prefab index 9edd2ac..e29e610 100644 --- a/Assets/Prefabs/DongYouLiQing/CanMou/CanMouPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/CanMou/CanMouPanel.prefab @@ -1614,7 +1614,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1061021070805320 @@ -3641,8 +3641,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 109.5, y: -29} - m_SizeDelta: {x: 1534.2, y: 58} + m_AnchoredPosition: {x: 88.1, y: -29} + m_SizeDelta: {x: 1491.5, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222070419946047532 CanvasRenderer: @@ -4008,7 +4008,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224216489189491686 RectTransform: m_ObjectHideFlags: 0 @@ -4898,7 +4898,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224659288970314172 RectTransform: m_ObjectHideFlags: 0 @@ -5344,7 +5344,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114938972690622534 @@ -5601,7 +5601,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224561383587384670 RectTransform: m_ObjectHideFlags: 0 @@ -6879,7 +6879,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -12728,7 +12728,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1564166072602674 @@ -14153,7 +14153,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1619179952406638 @@ -15144,7 +15144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224356697748222118 RectTransform: m_ObjectHideFlags: 0 @@ -17024,7 +17024,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222229450464842148 CanvasRenderer: @@ -20916,7 +20916,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1994074409187910 @@ -20953,7 +20953,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1999977839430958 @@ -21166,11 +21166,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224534332134038426} m_Modifications: - - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, - type: 3} - propertyPath: m_Name - value: ExitButton - objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_LocalPosition.x @@ -21239,12 +21234,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} @@ -21276,6 +21271,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, + type: 3} + propertyPath: m_Name + value: ExitButton + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3} --- !u!224 &2385980339624036238 stripped diff --git a/Assets/Prefabs/DongYouLiQing/GuanChaTuan/GuanChaTuanPanel.prefab b/Assets/Prefabs/DongYouLiQing/GuanChaTuan/GuanChaTuanPanel.prefab index 8269ee7..b9b3e59 100644 --- a/Assets/Prefabs/DongYouLiQing/GuanChaTuan/GuanChaTuanPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/GuanChaTuan/GuanChaTuanPanel.prefab @@ -11091,7 +11091,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1330629636121432 @@ -13388,7 +13388,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -15337,7 +15337,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224096777858579400 RectTransform: m_ObjectHideFlags: 0 @@ -21126,7 +21126,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224791023780295080 RectTransform: m_ObjectHideFlags: 0 @@ -21675,7 +21675,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224346811664082756 RectTransform: m_ObjectHideFlags: 0 @@ -22328,7 +22328,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1665015272976436 @@ -23326,7 +23326,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114317151367891894 @@ -24824,7 +24824,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1740124304332330 @@ -25943,7 +25943,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222586041365359980 CanvasRenderer: @@ -26874,7 +26874,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1787578722129708 @@ -28631,7 +28631,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224087810123336640 RectTransform: m_ObjectHideFlags: 0 @@ -31645,7 +31645,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1953670546481092 @@ -33369,11 +33369,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224667998369960478} m_Modifications: - - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, - type: 3} - propertyPath: m_Name - value: ExitButton - objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_LocalPosition.x @@ -33442,12 +33437,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} @@ -33479,6 +33474,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, + type: 3} + propertyPath: m_Name + value: ExitButton + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3} --- !u!224 &4819213781553918863 stripped diff --git a/Assets/Prefabs/DongYouLiQing/LeadGroup/DaoDiaoZuPanel.prefab b/Assets/Prefabs/DongYouLiQing/LeadGroup/DaoDiaoZuPanel.prefab index 2329b41..2d65380 100644 --- a/Assets/Prefabs/DongYouLiQing/LeadGroup/DaoDiaoZuPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/LeadGroup/DaoDiaoZuPanel.prefab @@ -4357,9 +4357,9 @@ RectTransform: m_Father: {fileID: 224593752977475340} 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: 170.5, y: -26.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 341, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222667486833100536 @@ -4946,7 +4946,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -5816,9 +5816,9 @@ RectTransform: m_Father: {fileID: 224593752977475340} 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: 170.5, y: -185.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 341, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222938505400359584 @@ -10570,9 +10570,9 @@ RectTransform: m_Father: {fileID: 224593752977475340} 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: 170.46, y: -79.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 340.92, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222193425700973958 @@ -18230,7 +18230,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1383416306466050 @@ -18339,8 +18339,8 @@ RectTransform: m_Father: {fileID: 224149664170977486} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: 10, y: -8.2} m_Pivot: {x: 0.5, y: 0.5} @@ -18430,7 +18430,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222872685688108236 CanvasRenderer: @@ -20112,9 +20112,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &114280917954283656 MonoBehaviour: @@ -20875,7 +20875,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224672882507827614 RectTransform: m_ObjectHideFlags: 0 @@ -21214,7 +21214,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -23219,7 +23219,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -30619,7 +30619,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1655993534987048 @@ -34557,7 +34557,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224463090213229984 RectTransform: m_ObjectHideFlags: 0 @@ -34576,7 +34576,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -470} + m_AnchoredPosition: {x: 0, y: -376} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1744711084757736 @@ -34767,9 +34767,9 @@ RectTransform: m_Father: {fileID: 224593752977475340} 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: 170.46, y: -132.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 340.92, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222698988410132616 @@ -35893,7 +35893,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224991884083742940 RectTransform: m_ObjectHideFlags: 0 @@ -37754,7 +37754,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224697732980103562 RectTransform: m_ObjectHideFlags: 0 @@ -37773,7 +37773,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -423} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1801578506507142 @@ -38604,7 +38604,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114847747818603910 @@ -43552,7 +43552,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1919453506991358 @@ -44770,7 +44770,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1949578561117190 @@ -46235,7 +46235,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1986480514913218 @@ -46406,7 +46406,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224349629541936074 RectTransform: m_ObjectHideFlags: 0 @@ -46425,7 +46425,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -329} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1993851710786002 @@ -47204,12 +47204,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} diff --git a/Assets/Prefabs/DongYouLiQing/PersonListItem.prefab b/Assets/Prefabs/DongYouLiQing/PersonListItem.prefab index c9601d7..30554f9 100644 --- a/Assets/Prefabs/DongYouLiQing/PersonListItem.prefab +++ b/Assets/Prefabs/DongYouLiQing/PersonListItem.prefab @@ -1,22 +1,12 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1678454564256140} - m_IsPrefabParent: 1 --- !u!1 &1678454564256140 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 224013960789662944} - component: {fileID: 222847911091948128} @@ -28,11 +18,39 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!224 &224013960789662944 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678454564256140} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222847911091948128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678454564256140} + m_CullTransparentMesh: 0 --- !u!114 &114544493485093352 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1678454564256140} m_Enabled: 1 m_EditorHideFlags: 0 @@ -49,7 +67,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3} - m_FontSize: 18 + m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -61,27 +79,3 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6F14\u7EC3\u5386\u65F6" ---- !u!222 &222847911091948128 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1678454564256140} ---- !u!224 &224013960789662944 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1678454564256140} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 320, y: 30} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/DongYouLiQing/ZongZhiDa/DaDuiZhiHuiPanel.prefab b/Assets/Prefabs/DongYouLiQing/ZongZhiDa/DaDuiZhiHuiPanel.prefab index 5785767..d5c115c 100644 --- a/Assets/Prefabs/DongYouLiQing/ZongZhiDa/DaDuiZhiHuiPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/ZongZhiDa/DaDuiZhiHuiPanel.prefab @@ -54,7 +54,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -1330,7 +1330,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114513865482627270 @@ -3779,7 +3779,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224098273161305870 RectTransform: m_ObjectHideFlags: 0 @@ -4118,7 +4118,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224831362761070846 RectTransform: m_ObjectHideFlags: 0 @@ -4756,7 +4756,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224505926579873678 RectTransform: m_ObjectHideFlags: 0 @@ -6120,7 +6120,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1305983246858256 @@ -6869,7 +6869,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1338398322155504 @@ -7212,7 +7212,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1349055196317762 @@ -7249,7 +7249,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1351223645067008 @@ -8150,7 +8150,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1400534936169278 @@ -15392,7 +15392,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224432049134435702 RectTransform: m_ObjectHideFlags: 0 @@ -18260,7 +18260,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222910147882734246 CanvasRenderer: @@ -22153,11 +22153,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224247944140956212} m_Modifications: - - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, - type: 3} - propertyPath: m_Name - value: ExitButton - objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_LocalPosition.x @@ -22226,12 +22221,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} @@ -22263,6 +22258,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, + type: 3} + propertyPath: m_Name + value: ExitButton + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3} --- !u!224 &6077334707552001302 stripped diff --git a/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZhiDuiZhiHuiPanel.prefab b/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZhiDuiZhiHuiPanel.prefab index 376a918..81947fb 100644 --- a/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZhiDuiZhiHuiPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZhiDuiZhiHuiPanel.prefab @@ -344,7 +344,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1015172423924106 @@ -437,7 +437,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224096033438962826 RectTransform: m_ObjectHideFlags: 0 @@ -661,7 +661,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222596797394194204 CanvasRenderer: @@ -1140,7 +1140,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -8178,7 +8178,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1371279487459382 @@ -12333,7 +12333,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224009431250135790 RectTransform: m_ObjectHideFlags: 0 @@ -13182,7 +13182,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114180424232937942 @@ -16018,7 +16018,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224428623229268982 RectTransform: m_ObjectHideFlags: 0 @@ -17211,7 +17211,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1765333987000606 @@ -17303,7 +17303,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224572032015825236 RectTransform: m_ObjectHideFlags: 0 @@ -19679,7 +19679,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1849433955129100 @@ -21620,7 +21620,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1957287575543822 @@ -22277,11 +22277,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224112599686047538} m_Modifications: - - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, - type: 3} - propertyPath: m_Name - value: ExitButton - objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_LocalPosition.x @@ -22350,12 +22345,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} @@ -22387,6 +22382,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, + type: 3} + propertyPath: m_Name + value: ExitButton + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3} --- !u!224 &192790284293878849 stripped diff --git a/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZongDuiZhiHuiPanel.prefab b/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZongDuiZhiHuiPanel.prefab index 8773a5c..d259313 100644 --- a/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZongDuiZhiHuiPanel.prefab +++ b/Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZongDuiZhiHuiPanel.prefab @@ -667,7 +667,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224957977589580966 RectTransform: m_ObjectHideFlags: 0 @@ -1773,7 +1773,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -517} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!114 &114155250790885368 @@ -3698,7 +3698,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 155, y: 564} + m_SizeDelta: {x: 155, y: 376} m_Pivot: {x: 0, y: 1} --- !u!222 &222908825897272950 CanvasRenderer: @@ -4585,7 +4585,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224554587675703042 RectTransform: m_ObjectHideFlags: 0 @@ -6788,7 +6788,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224409598570302652 RectTransform: m_ObjectHideFlags: 0 @@ -7042,7 +7042,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -376} + m_AnchoredPosition: {x: 0, y: -282} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1315341839446830 @@ -7284,7 +7284,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 0, y: -94} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1326431297987128 @@ -15864,7 +15864,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224913059320007356 RectTransform: m_ObjectHideFlags: 0 @@ -17104,7 +17104,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -17580,7 +17580,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -282} + m_AnchoredPosition: {x: 0, y: -235} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1778595488888718 @@ -19306,7 +19306,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1869707572612388 @@ -21584,7 +21584,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -188} + m_AnchoredPosition: {x: 0, y: -141} m_SizeDelta: {x: 155, y: 47} m_Pivot: {x: 0, y: 1} --- !u!1 &1985779591512628 @@ -22277,11 +22277,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224025558114677860} m_Modifications: - - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, - type: 3} - propertyPath: m_Name - value: ExitButton - objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_LocalPosition.x @@ -22350,12 +22345,12 @@ PrefabInstance: - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.x - value: 55.95 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} propertyPath: m_SizeDelta.y - value: 57.5 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79, type: 3} @@ -22387,6 +22382,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79, + type: 3} + propertyPath: m_Name + value: ExitButton + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3} --- !u!224 &4012918980636462699 stripped diff --git a/Assets/Scripts/DongYouLiQing/LeadGroup/WarCommuniqueToggle.cs b/Assets/Scripts/DongYouLiQing/LeadGroup/WarCommuniqueToggle.cs index d11e64e..71d1c39 100644 --- a/Assets/Scripts/DongYouLiQing/LeadGroup/WarCommuniqueToggle.cs +++ b/Assets/Scripts/DongYouLiQing/LeadGroup/WarCommuniqueToggle.cs @@ -19,7 +19,7 @@ public class WarCommuniqueToggle : BaseToggle { public override void RespondFun(bool value) { OverAllReportPanel.SetActive(value); - EventPanel.SetActive(value); + // EventPanel.SetActive(value); //transform.Find("Image").gameObject.SetActive(value); }