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 45a58f2c5..a3521f6e4 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ 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