From 6c3bf12de0b80c86b7abb6ef5c8a7d75f3efe97b Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Wed, 26 Apr 2023 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/battle/battle_result_ui.lua.bytes  | Bin 6671 -> 7536 bytes
 .../prefabs/ui/battle/battle_result_ui.prefab | 122 +++++++++++-------
 Assets/prefabs/ui/common/reward_cell.prefab   |   2 +-
 3 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes
index 45a58f2c5d01cccb48b32b06b57ed2ef3663b764..a3521f6e41e860bea294db187260482f9dd2ea74 100644
GIT binary patch
delta 2439
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
T5VJmq0vAyr+hDA1!`%8$am*Oo

delta 1567
zcmZ|P-EUfT7zc2mh0;P_4rNfv4uy8zsRg<N99~Y#X_3+O6$i9HY3ce(DLw7lLn)<i
z<3=xxF)ni9jfpoVQ?DAc&Fw~SrpdI6I=BBolhtO4)5K_&sb9=yjEQ%Ac%Ji|=RCjX
zoS(YiVh)c~a;Ybq>Squ5(gW4G;^(<eX5>3T$bYc2G2g$p`}q0^GjN}N@@uA$J+9o_
zNjZ7vvFdQ+Z{LBp{^eKqb{^+==F7;2@GP^pIWOHUM4i05oFC8J%JKoW5bSG;^>InE
zO*ti-8y=Ngqb(t2Z_=)oj^}4xv7(lv7b6{Bfh0Ra`fB3{NzwVZ<!pddyN0zITU4oe
zS)%W?`3<BrEfP_|{Y11rET+PCL**c;FvXQYhb7<YJulrVteTzTe6Oa^n^O_{bZfVF
z!Bxe(r3EG}Cl<RL9lU#PeB!kAK$>KUFi9#BM4hj{Q)dmaA+s?m(RC&a)n_O4t@Lcn
z<PKNZmE#7D&sk%MND?L@N|MdqU9IUAT~DZq2}Wo^;4#O*bYY08EyXl(Y8pyHb<SWU
zDhQcNFbl81&Mt<!oRz@F(gTg3m_`AeknuDlrD2HSlO;-P7EhMOwC9R?IEJ_iaRTud
zJ_T!F1L9%CHSj5zfFrOTZh}?tCAb;Z!Hv&N!W-~GcerW{abYau$u8JJ&W^wwT2!HB
z7A+UOlyaAIwjrS&35x+|90jsL70uZ`^k{wvc>cVb<KL-`(Cfn5t=~~Fdzbm~`kN8@
zP+0bCz8_$}sdk-we59g3p*uXEe*aoG`-YRhaq+(0^2>?WNqxaS8@bMZdla!hJ$%&t
zFm?OFA47Tm=X)ypp|H%Zri#AXpULsZ(N)Jy`cco7YqIX-SIi1~kzg*{KI&Ob1#Ul8
zF#OGn_vxtPn7z6fV3%HJPS~#r$CJ(Do*UPy*rbBVyn8P~Pi?$CFrK=@F5>}ggT@(y
zbj^KA)LBrsZ&xHuF2A~Et*c654R%@v3<*{g6&v)UwxXybs+h#qmq#S*a?ek3ovm{x
zNv}NCC^3!f_hSjmw#%Xt;qsJ@^HqgZ*r7`4sI|eWt)-@0R{GrMD@hVd%fxCpULG>_
zu5aZ<gN;hp@O~g(IdRSrXjALrBEsj;aWia)<NVUC^h{Vw$R-q)z3Q0`TVQLqd0OVM
z4in~yI_J=&U#-<oi)($f@~p2WQQa5c#F^q{_F&EUW;ASoNgRn5?uW&&q}0-+Pf74g
zjEDk}3yA!mYY_J%E<?T)`SoxRu7+!1F+2*(Va0!4dap@ed~u}=nJhAM66LrWnS~{W
zcaBgAZ-cG}L)D<?G->Ai;ijsjmRz&L`xv@6p_L6ss;%P$N6x|&_R=v~VIG<2_SN+-
zCU7WM@XY>@#u{!c*H5F9`Cx0TCNowy)nP1#r3O8*j2p(v4WyWvig5F2BVlTohxNFi
zn5d77`l*<PyHJ@}97Mr^e+qUXK8=FgGE-C?LBn&{f}AL(u9?KU+=Q(NA%8XPHmi)*
zs)N3j7VW|rj!PSjnv7dN%jD%n!~O~iY@&f3+_3zq*nkDN2-ENaya%ttCU_j?;Xzmh
z+h8B;g12Ea+zPAV3|tSNhJS-^z~wDCpxT4V_Andr^ioOb8KV~?ZpBEmvlaTqt~Lu#
fz0|POsa)#WZIP|pnfBZ^3M`;NxxrkQC4c5GcHPWE

diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab
index f690c0c2e..fd3b35385 100644
--- a/Assets/prefabs/ui/battle/battle_result_ui.prefab
+++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab
@@ -144,6 +144,71 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &489772084002005484
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5931961978628687540}
+  - component: {fileID: 8443514610547296044}
+  - component: {fileID: 4451181475544731814}
+  m_Layer: 0
+  m_Name: mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5931961978628687540
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 489772084002005484}
+  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: 4165930251451731960}
+  m_RootOrder: 19
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -408}
+  m_SizeDelta: {x: 0, y: 260}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8443514610547296044
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 489772084002005484}
+  m_CullTransparentMesh: 1
+--- !u!114 &4451181475544731814
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 489772084002005484}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1343827114221771081
 GameObject:
   m_ObjectHideFlags: 0
@@ -611,7 +676,7 @@ RectTransform:
   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: -491}
+  m_AnchoredPosition: {x: 0, y: -580}
   m_SizeDelta: {x: 127, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7018836348626570577
@@ -1191,10 +1256,10 @@ RectTransform:
   m_Father: {fileID: 7230028725123809823}
   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}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 600, y: 170}
+  m_SizeDelta: {x: 0, y: 170}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5214828052616705242
 CanvasRenderer:
@@ -1913,7 +1978,7 @@ RectTransform:
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &968552262374500910
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3290,8 +3355,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5464804407005357940}
-  - component: {fileID: 7713147140649759855}
-  - component: {fileID: 2738371392909055350}
   - component: {fileID: 5046671634118916478}
   - component: {fileID: 4801709679344541828}
   m_Layer: 5
@@ -3314,51 +3377,13 @@ RectTransform:
   m_Children:
   - {fileID: 7230028725123809823}
   m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 19
+  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: 0, y: -376}
-  m_SizeDelta: {x: 600, y: 170}
+  m_AnchoredPosition: {x: 0, y: -408}
+  m_SizeDelta: {x: 560, y: 260}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7713147140649759855
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7755420184075982668}
-  m_CullTransparentMesh: 1
---- !u!114 &2738371392909055350
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7755420184075982668}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &5046671634118916478
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4362,6 +4387,7 @@ RectTransform:
   - {fileID: 5313457591195514166}
   - {fileID: 8498021877501455119}
   - {fileID: 3748114741305968975}
+  - {fileID: 5931961978628687540}
   - {fileID: 5464804407005357940}
   m_Father: {fileID: 0}
   m_RootOrder: 0
diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab
index 95e7f3135..0da96a54d 100644
--- a/Assets/prefabs/ui/common/reward_cell.prefab
+++ b/Assets/prefabs/ui/common/reward_cell.prefab
@@ -69,7 +69,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1