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 3277b5808..4b9ce9bef 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/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 81076c3ad..d5738c71a 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index acc0d8845..a33e7abb1 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -98,12 +98,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 11 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 5 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: -92.46918, y: 128} + m_AnchoredPosition: {x: -92.46918, y: 112} m_SizeDelta: {x: 62, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1618187034406966015 @@ -209,6 +209,72 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &544577213108926206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4567631707956313030} + - component: {fileID: 8874262674661501374} + - component: {fileID: 6491287344444226109} + m_Layer: 5 + m_Name: unit_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4567631707956313030 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544577213108926206} + 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: + - {fileID: 1112461946326730134} + - {fileID: 5637448674548143003} + - {fileID: 7156597497233077380} + - {fileID: 7856976683170364790} + - {fileID: 1395054053664364182} + - {fileID: 4537460506209909950} + - {fileID: 4256631273791126118} + - {fileID: 5853085491076849237} + - {fileID: 5313457591195514166} + m_Father: {fileID: 4165930251451731960} + m_RootOrder: 4 + 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: 16} + m_SizeDelta: {x: 584, y: 368} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8874262674661501374 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544577213108926206} + m_CullTransparentMesh: 1 +--- !u!225 &6491287344444226109 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544577213108926206} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1329637260721579049 GameObject: m_ObjectHideFlags: 0 @@ -1095,12 +1161,12 @@ RectTransform: - {fileID: 9014929677433328641} - {fileID: 58389089297126115} - {fileID: 2169861547617794360} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 8 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 4 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: -249, y: -90} + m_AnchoredPosition: {x: -249, y: -106} m_SizeDelta: {x: 228, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &2938922198113165659 @@ -1162,7 +1228,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4165930251451731960} - m_RootOrder: 17 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1677,12 +1743,12 @@ RectTransform: - {fileID: 6852101474593447195} - {fileID: 4966872020525245394} - {fileID: 5771341228602495763} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 5 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 1 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: 26, y: 37} + m_AnchoredPosition: {x: 26, y: 21} m_SizeDelta: {x: 228, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &9070863500347552405 @@ -1788,12 +1854,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 14 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 8 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: 62.5} + m_AnchoredPosition: {x: 0, y: 46.5} m_SizeDelta: {x: 200, y: 23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2638528053824224956 @@ -1922,12 +1988,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 9 + m_Father: {fileID: 2055814062249542618} + 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_AnchoredPosition: {x: 0, y: 128} + m_AnchoredPosition: {x: 0, y: 112} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1105495610083196996 @@ -2244,12 +2310,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 13 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 7 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: 165} + m_AnchoredPosition: {x: 0, y: 149} m_SizeDelta: {x: 200, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &415780347601901034 @@ -2468,12 +2534,12 @@ RectTransform: - {fileID: 2314418690377365568} - {fileID: 7039005353085213621} - {fileID: 4768761162542737754} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 4 + m_Father: {fileID: 4567631707956313030} + 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_AnchoredPosition: {x: -249, y: 37} + m_AnchoredPosition: {x: -249, y: 21} m_SizeDelta: {x: 228, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &3530958538301786522 @@ -2628,7 +2694,7 @@ RectTransform: - {fileID: 5931961978628687540} - {fileID: 5464804407005357940} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 15 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3157,8 +3223,9 @@ GameObject: - component: {fileID: 1903267056959353055} - component: {fileID: 6745387017925834104} - component: {fileID: 4658955252556872413} + - component: {fileID: 2244352369522363938} m_Layer: 5 - m_Name: bg + m_Name: unit_node m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3174,7 +3241,8 @@ RectTransform: 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_Children: + - {fileID: 7834038970147409906} m_Father: {fileID: 445959573539459069} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3221,6 +3289,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &2244352369522363938 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6606104105387947548} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &6684480207332659927 GameObject: m_ObjectHideFlags: 0 @@ -3299,12 +3379,12 @@ RectTransform: - {fileID: 1266341984854585330} - {fileID: 7619075263467068112} - {fileID: 6798161449136858622} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 7 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 3 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: 26, y: -27} + m_AnchoredPosition: {x: 26, y: -43} m_SizeDelta: {x: 228, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &374806246039785815 @@ -4301,12 +4381,12 @@ RectTransform: - {fileID: 6693438461061620862} - {fileID: 8868055871964016938} - {fileID: 8227478214254302735} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 6 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 2 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: -249, y: -27} + m_AnchoredPosition: {x: -249, y: -43} m_SizeDelta: {x: 228, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &4512577292908893855 @@ -4369,7 +4449,7 @@ RectTransform: - {fileID: 9111143417478338148} - {fileID: 989359163880103993} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 16 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4689,12 +4769,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 12 + m_Father: {fileID: 4567631707956313030} + m_RootOrder: 6 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: 128} + m_AnchoredPosition: {x: 0, y: 112} m_SizeDelta: {x: 200, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8665334937928820573 @@ -4850,8 +4930,9 @@ GameObject: - component: {fileID: 2055814062249542618} - component: {fileID: 574983483701642747} - component: {fileID: 4096482855526652001} + - component: {fileID: 1995437238301462556} m_Layer: 5 - m_Name: bg + m_Name: unit_node m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4867,7 +4948,8 @@ RectTransform: 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_Children: + - {fileID: 6892244337032643932} m_Father: {fileID: 595361820078002785} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4914,6 +4996,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!225 &1995437238301462556 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8283736472652806603} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &8318502709273895504 GameObject: m_ObjectHideFlags: 0 @@ -5018,12 +5112,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 10 + m_Father: {fileID: 1903267056959353055} + 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_AnchoredPosition: {x: 0, y: 128} + m_AnchoredPosition: {x: 0, y: 112} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1159346813050732172 @@ -5167,17 +5261,7 @@ RectTransform: - {fileID: 6494950659398821500} - {fileID: 445959573539459069} - {fileID: 595361820078002785} - - {fileID: 1112461946326730134} - - {fileID: 5637448674548143003} - - {fileID: 7156597497233077380} - - {fileID: 7856976683170364790} - - {fileID: 1395054053664364182} - - {fileID: 6892244337032643932} - - {fileID: 7834038970147409906} - - {fileID: 4537460506209909950} - - {fileID: 4256631273791126118} - - {fileID: 5853085491076849237} - - {fileID: 5313457591195514166} + - {fileID: 4567631707956313030} - {fileID: 4577988863392537264} - {fileID: 857920695478745459} - {fileID: 3748114741305968975} @@ -5264,40 +5348,40 @@ MonoBehaviour: hashName: 3954641459 objectType: 0 gameObject: {fileID: 4219140817413126819} - - name: battle_result_ui.unit_result_report_cell_1 - hashName: 1292602169 + - name: battle_result_ui.unit_node.unit_result_report_cell_1 + hashName: 619987752 objectType: 1 gameObject: {fileID: 5287820198550774767} - - name: battle_result_ui.unit_result_report_cell_2 - hashName: 1292602170 + - name: battle_result_ui.unit_node.unit_result_report_cell_2 + hashName: 619987753 objectType: 1 gameObject: {fileID: 4473993659156335091} - - name: battle_result_ui.unit_result_report_cell_3 - hashName: 1292602171 + - name: battle_result_ui.unit_node.unit_result_report_cell_3 + hashName: 619987754 objectType: 1 gameObject: {fileID: 7867390261879565403} - - name: battle_result_ui.unit_result_report_cell_4 - hashName: 1292602172 + - name: battle_result_ui.unit_node.unit_result_report_cell_4 + hashName: 619987755 objectType: 1 gameObject: {fileID: 6827853139347391943} - - name: battle_result_ui.unit_result_report_cell_5 - hashName: 1292602173 + - name: battle_result_ui.unit_node.unit_result_report_cell_5 + hashName: 619987756 objectType: 1 gameObject: {fileID: 3577224878034465176} - - name: battle_result_ui.icon - hashName: 373750744 + - name: battle_result_ui.unit_node.icon + hashName: 948325513 objectType: 0 gameObject: {fileID: 325589638008138562} - - name: battle_result_ui.desc_1 - hashName: 2550992290 + - name: battle_result_ui.unit_node.desc_1 + hashName: 666564115 objectType: 0 gameObject: {fileID: 5070912463384784497} - - name: battle_result_ui.desc_2 - hashName: 2550992291 + - name: battle_result_ui.unit_node.desc_2 + hashName: 666564116 objectType: 0 gameObject: {fileID: 8019260360389798227} - - name: battle_result_ui.desc_3 - hashName: 2550992292 + - name: battle_result_ui.unit_node.desc_3 + hashName: 666564117 objectType: 0 gameObject: {fileID: 4662077983329433296} - name: battle_result_ui.reward_node.reward_title @@ -5320,12 +5404,12 @@ MonoBehaviour: hashName: 2801961136 objectType: 6 gameObject: {fileID: 4437137689668192280} - - name: battle_result_ui.report_img_v - hashName: 2099228814 + - name: battle_result_ui.victory_node.unit_node.report_img_v + hashName: 2853388320 objectType: 0 gameObject: {fileID: 4913348932269187955} - - name: battle_result_ui.report_img_d - hashName: 2099228796 + - name: battle_result_ui.defeat_node.unit_node.report_img_d + hashName: 1891569165 objectType: 0 gameObject: {fileID: 8531577034970334290} - name: battle_result_ui.gold_pig @@ -5352,6 +5436,18 @@ MonoBehaviour: hashName: 2598454483 objectType: 0 gameObject: {fileID: 5449702802643703036} + - name: battle_result_ui.unit_node + hashName: 3801932766 + objectType: 0 + gameObject: {fileID: 544577213108926206} + - name: battle_result_ui.defeat_node.unit_node + hashName: 3994323454 + objectType: 0 + gameObject: {fileID: 6606104105387947548} + - name: battle_result_ui.victory_node.unit_node + hashName: 456272477 + objectType: 0 + gameObject: {fileID: 8283736472652806603} --- !u!1 &8897498284405031625 GameObject: m_ObjectHideFlags: 0 @@ -5731,16 +5827,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &1062877572076605182 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 2753676652289451360} - m_PrefabAsset: {fileID: 0} --- !u!1 &4437137689668192280 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 2753676652289451360} m_PrefabAsset: {fileID: 0} +--- !u!224 &1062877572076605182 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2753676652289451360} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4837857829111055852 PrefabInstance: m_ObjectHideFlags: 0 @@ -5971,18 +6067,26 @@ PrefabInstance: propertyPath: m_Name value: reward_cell objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6876715644725703649, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Alpha + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &2842982108316905967 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 8813075811754304613} - m_PrefabAsset: {fileID: 0} --- !u!224 &6478638276743894065 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 8813075811754304613} m_PrefabAsset: {fileID: 0} +--- !u!1 &2842982108316905967 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 8813075811754304613} + m_PrefabAsset: {fileID: 0} --- !u!114 &4162544796182612831 MonoBehaviour: m_ObjectHideFlags: 0