diff --git a/Assets/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab index 1df60b9d3..c01284826 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab @@ -957,10 +957,10 @@ RectTransform: m_Father: {fileID: 1164488007620484532} m_RootOrder: 21 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.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 720, y: 0} + m_SizeDelta: {x: 720, y: 1280} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2148877495275438842 GameObject: @@ -1289,10 +1289,10 @@ RectTransform: m_Father: {fileID: 1164488007620484532} m_RootOrder: 19 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.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 263.5, y: -424.5} - m_SizeDelta: {x: 113, y: -1159} + m_SizeDelta: {x: 113, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &201130767560526306 CanvasRenderer: @@ -3148,10 +3148,10 @@ RectTransform: m_Father: {fileID: 1164488007620484532} m_RootOrder: 18 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.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -263.5, y: -424.5} - m_SizeDelta: {x: 113, y: -1159} + m_SizeDelta: {x: 113, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2049383473186769210 CanvasRenderer: diff --git a/Assets/prefabs/ui/activity/act_pvp/act_pvp_playing_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_playing_ui.prefab index 1ae44aa82..7241b97f3 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_playing_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_playing_ui.prefab @@ -30,6 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3032866614547631344} + - {fileID: 2878882577378170695} m_Father: {fileID: 8515822730150599069} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1296,26 +1297,20 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3621749977480399554} - {fileID: 5983911017831994353} - {fileID: 6112524406724755908} - {fileID: 3997333936836421156} - {fileID: 4460697164254696797} - {fileID: 1687701295210826811} - {fileID: 8159805790479767894} - - {fileID: 2003697278586492503} - - {fileID: 5347093002384380731} - - {fileID: 4271562919194668935} - - {fileID: 8749636484687402574} - - {fileID: 2782457576128429734} - {fileID: 8510534536091425954} - m_Father: {fileID: 1164488007620484532} - m_RootOrder: 20 + m_Father: {fileID: 5549995152151798572} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -587} - m_SizeDelta: {x: 0, y: -1174} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2148877495275438842 GameObject: @@ -1772,8 +1767,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2878882577378170695} - m_RootOrder: 11 + m_Father: {fileID: 1164488007620484532} + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2166,12 +2161,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2878882577378170695} - m_RootOrder: 10 + m_Father: {fileID: 1164488007620484532} + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -95, y: 466.5} + m_AnchoredPosition: {x: -95, y: -120.5} m_SizeDelta: {x: 42, y: 27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1559064464076549513 @@ -3180,7 +3175,7 @@ RectTransform: - {fileID: 7484008451740010681} - {fileID: 889749024255413805} m_Father: {fileID: 2878882577378170695} - m_RootOrder: 12 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3627,7 +3622,7 @@ RectTransform: - {fileID: 251126188805535500} - {fileID: 4829755007660213685} m_Father: {fileID: 2878882577378170695} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3702,12 +3697,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2878882577378170695} - m_RootOrder: 0 + m_Father: {fileID: 1164488007620484532} + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 156, y: 466.5} + m_AnchoredPosition: {x: 156, y: -120.5} m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8185758678648318718 @@ -4656,12 +4651,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2878882577378170695} - m_RootOrder: 8 + m_Father: {fileID: 1164488007620484532} + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -34, y: 466.5} + m_AnchoredPosition: {x: -34, y: -120.5} m_SizeDelta: {x: 54, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3960545982402027345 @@ -4793,7 +4788,7 @@ RectTransform: m_Children: - {fileID: 1663105200002422442} m_Father: {fileID: 1164488007620484532} - m_RootOrder: 22 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -5284,8 +5279,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7034481628200669052} - m_Father: {fileID: 2878882577378170695} - m_RootOrder: 7 + m_Father: {fileID: 1164488007620484532} + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -5600,7 +5595,12 @@ RectTransform: - {fileID: 4544324634351918687} - {fileID: 5330751673859728803} - {fileID: 7847415391715701161} - - {fileID: 2878882577378170695} + - {fileID: 3621749977480399554} + - {fileID: 2782457576128429734} + - {fileID: 8749636484687402574} + - {fileID: 4271562919194668935} + - {fileID: 5347093002384380731} + - {fileID: 2003697278586492503} - {fileID: 6412724117700732193} - {fileID: 285455064192562705} m_Father: {fileID: 8515822730150599069} @@ -6109,12 +6109,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2878882577378170695} - m_RootOrder: 9 + m_Father: {fileID: 1164488007620484532} + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 94, y: 466.5} + m_AnchoredPosition: {x: 94, y: -120.5} m_SizeDelta: {x: 38, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4910089232135742116 @@ -6231,7 +6231,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchorMax.x @@ -6311,16 +6311,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!1 &3735136512005200052 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 404037146719488732} - m_PrefabAsset: {fileID: 0} --- !u!224 &3997333936836421156 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} m_PrefabInstance: {fileID: 404037146719488732} m_PrefabAsset: {fileID: 0} +--- !u!1 &3735136512005200052 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 404037146719488732} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1082442544623057317 PrefabInstance: m_ObjectHideFlags: 0 @@ -6338,7 +6338,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchorMax.x @@ -6418,16 +6418,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!1 &4128438257206209485 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 1082442544623057317} - m_PrefabAsset: {fileID: 0} --- !u!224 &4460697164254696797 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} m_PrefabInstance: {fileID: 1082442544623057317} m_PrefabAsset: {fileID: 0} +--- !u!1 &4128438257206209485 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 1082442544623057317} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2704944630465208515 PrefabInstance: m_ObjectHideFlags: 0 @@ -6445,7 +6445,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchorMax.x @@ -6552,7 +6552,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchorMax.x @@ -6659,7 +6659,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchorMax.x @@ -6778,7 +6778,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 21 + value: 26 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x @@ -6862,16 +6862,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &7758974447042782151 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 8073139171046526655} - m_PrefabAsset: {fileID: 0} --- !u!224 &6412724117700732193 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 8073139171046526655} m_PrefabAsset: {fileID: 0} +--- !u!1 &7758974447042782151 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 8073139171046526655} + m_PrefabAsset: {fileID: 0} --- !u!223 &6932700759231077266 Canvas: m_ObjectHideFlags: 0