From 1ecdf0cd14b9ca8299047568233cce45c08e0d8f Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Sat, 16 Sep 2023 18:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/act_pvp/act_pvp_main_ui.prefab   | 24 +++++++++++--------
 .../act_pvp/act_pvp_playing_ui.prefab         | 12 ++++++----
 2 files changed, 22 insertions(+), 14 deletions(-)

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 4460f0b56..1df60b9d3 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
@@ -955,7 +955,7 @@ RectTransform:
   - {fileID: 802557950483036959}
   - {fileID: 2550418228025460676}
   m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 22
+  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}
@@ -1287,7 +1287,7 @@ RectTransform:
   - {fileID: 2786904949183194332}
   - {fileID: 3755081125283664127}
   m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 20
+  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}
@@ -1800,6 +1800,10 @@ MonoBehaviour:
     hashName: 1964509923
     objectType: 6
     gameObject: {fileID: 6833354843735675599}
+  - name: act_pvp_main_ui.bg.pop_bg
+    hashName: 3565157094
+    objectType: 0
+    gameObject: {fileID: 7015589941142331158}
 --- !u!1 &3465621446953604566
 GameObject:
   m_ObjectHideFlags: 0
@@ -2593,7 +2597,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 21
+  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}
@@ -3142,7 +3146,7 @@ RectTransform:
   - {fileID: 6113532708751959367}
   - {fileID: 7494825451856947044}
   m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 19
+  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}
@@ -3322,13 +3326,13 @@ RectTransform:
   m_Children:
   - {fileID: 1663105200002422442}
   m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 18
+  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: 0, y: 312.5}
+  m_AnchoredPosition: {x: 73.6243, y: 213}
   m_SizeDelta: {x: 472, y: 199}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.6559837, y: 0}
 --- !u!222 &6258180528031255786
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3920,12 +3924,12 @@ RectTransform:
   - {fileID: 3510081205093146462}
   - {fileID: 3304861854431177958}
   - {fileID: 5599003144327131305}
-  - {fileID: 285455064192562705}
   - {fileID: 5330751673859728803}
   - {fileID: 7847415391715701161}
   - {fileID: 3621749977480399554}
   - {fileID: 3319398353475287542}
   - {fileID: 7892290873222747177}
+  - {fileID: 285455064192562705}
   m_Father: {fileID: 8515822730150599069}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4282,7 +4286,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_RootOrder
-      value: 23
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchorMax.x
@@ -4342,7 +4346,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -103.81
+      value: -58.33
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
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 300f3d171..59d0b973e 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
@@ -1857,6 +1857,10 @@ MonoBehaviour:
     hashName: 3552131602
     objectType: 6
     gameObject: {fileID: 7758974447042782151}
+  - name: act_pvp_playing_ui.bg.pop_bg
+    hashName: 3536058709
+    objectType: 0
+    gameObject: {fileID: 7015589941142331158}
 --- !u!1 &3465621446953604566
 GameObject:
   m_ObjectHideFlags: 0
@@ -3568,11 +3572,11 @@ RectTransform:
   m_Father: {fileID: 1164488007620484532}
   m_RootOrder: 22
   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: 0, y: -192}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 75.50827, y: 896.024}
   m_SizeDelta: {x: 472, y: 199}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0.6599752, y: 0.035296418}
 --- !u!222 &6258180528031255786
 CanvasRenderer:
   m_ObjectHideFlags: 0