From ae20156744b7ed964d39bb0fe4cb5c73c4d83880 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 21 Apr 2023 16:27:46 +0800 Subject: [PATCH] battle ui --- Assets/prefabs/ui/battle/battle_ui.prefab | 120 ++++++++++++++-------- 1 file changed, 80 insertions(+), 40 deletions(-) diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index f64d8eb7f..9348d0f05 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -388,11 +388,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 463079035279260010} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Father: {fileID: 2504279778520004305} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -771,7 +771,7 @@ RectTransform: - {fileID: 4106454344608963245} - {fileID: 1603915954017502330} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1181,7 +1181,7 @@ RectTransform: - {fileID: 7945390112548214915} - {fileID: 5938755434983395188} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2739,7 +2739,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} + m_Father: {fileID: 2504279778520004305} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -5136,7 +5136,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} + m_Father: {fileID: 2504279778520004305} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -5144,6 +5144,45 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 950} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5566892423729763058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2504279778520004305} + m_Layer: 5 + m_Name: battle_root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2504279778520004305 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5566892423729763058} + 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: 5198724544769838051} + - {fileID: 766509631108997893} + - {fileID: 5146938743224756479} + - {fileID: 8767600639872220622} + m_Father: {fileID: 4165930251451731960} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5608342323733900253 GameObject: m_ObjectHideFlags: 0 @@ -8101,7 +8140,7 @@ RectTransform: - {fileID: 4292633816534545540} - {fileID: 6497301874867098174} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -8218,7 +8257,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4165930251451731960} + m_Father: {fileID: 2504279778520004305} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -8781,10 +8820,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5198724544769838051} - - {fileID: 766509631108997893} - - {fileID: 5146938743224756479} - - {fileID: 8767600639872220622} + - {fileID: 2504279778520004305} - {fileID: 8367488913663849825} - {fileID: 1493758059695593667} - {fileID: 2868547218605158834} @@ -8852,8 +8888,8 @@ MonoBehaviour: hashName: 2544486462 objectType: 0 gameObject: {fileID: 606870700976508775} - - name: battle_ui.close_btn - hashName: 3753184482 + - name: battle_ui.top_node.close_btn + hashName: 4060698662 objectType: 0 gameObject: {fileID: 3919187627067218253} - name: battle_ui.bg_2.skill_node.skill_node_cell_1 @@ -8876,12 +8912,12 @@ MonoBehaviour: hashName: 3413014284 objectType: 1 gameObject: {fileID: 2632601909374628188} - - name: battle_ui.battle_node - hashName: 2083252022 + - name: battle_ui.battle_root.battle_node + hashName: 2280180049 objectType: 0 gameObject: {fileID: 2716961016822480841} - - name: battle_ui.bg_2.board_mask - hashName: 2544443688 + - name: battle_ui.bg_2.board_node.grid_node.board_mask + hashName: 3597945032 objectType: 0 gameObject: {fileID: 7688802235252301942} - name: battle_ui.bg_2.board_cache_node @@ -8892,8 +8928,8 @@ MonoBehaviour: hashName: 1224637066 objectType: 0 gameObject: {fileID: 8512114194521404538} - - name: battle_ui.battle_number_node - hashName: 96138628 + - name: battle_ui.battle_root.battle_number_node + hashName: 1289457417 objectType: 0 gameObject: {fileID: 8481230358941673083} - name: battle_ui.bg_2.skill_node @@ -8948,28 +8984,28 @@ MonoBehaviour: hashName: 3842705844 objectType: 0 gameObject: {fileID: 8984854456205409131} - - name: battle_ui.bg_2.board_node.ani_node.grid_cell_1 - hashName: 4261114228 + - name: battle_ui.bg_2.ani_node.grid_cell_1 + hashName: 1458131591 objectType: 1 gameObject: {fileID: 4532191219610058284} - - name: battle_ui.bg_2.board_node.ani_node.grid_cell_2 - hashName: 4261114229 + - name: battle_ui.bg_2.ani_node.grid_cell_2 + hashName: 1458131592 objectType: 1 gameObject: {fileID: 8568562378450594759} - - name: battle_ui.bg_2.board_node.ani_node.grid_cell_3 - hashName: 4261114230 + - name: battle_ui.bg_2.ani_node.grid_cell_3 + hashName: 1458131593 objectType: 1 gameObject: {fileID: 7746559084762877130} - - name: battle_ui.bg_2.board_node.ani_node.grid_cell_4 - hashName: 4261114231 + - name: battle_ui.bg_2.ani_node.grid_cell_4 + hashName: 1458131594 objectType: 1 gameObject: {fileID: 8240790560213506744} - - name: battle_ui.bg_2.board_node.ani_node.grid_cell_5 - hashName: 4261114232 + - name: battle_ui.bg_2.ani_node.grid_cell_5 + hashName: 1458131595 objectType: 1 gameObject: {fileID: 6456457455187257617} - - name: battle_ui.bg - hashName: 2542042008 + - name: battle_ui.battle_root.bg + hashName: 3444227869 objectType: 0 gameObject: {fileID: 463079035279260010} - name: battle_ui.top_node.buff_l.buff_1 @@ -9088,10 +9124,14 @@ MonoBehaviour: hashName: 4215141983 objectType: 1 gameObject: {fileID: 5822956687597775327} - - name: battle_ui.batttle_fx_node - hashName: 659684139 + - name: battle_ui.battle_root.batttle_fx_node + hashName: 1732925382 objectType: 0 gameObject: {fileID: 5506336141550111868} + - name: battle_ui.battle_root + hashName: 2083371542 + objectType: 0 + gameObject: {fileID: 5566892423729763058} --- !u!114 &305814484176852896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9331,7 +9371,7 @@ RectTransform: - {fileID: 3542903639894422700} - {fileID: 2367957692945644157} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 7 + 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} @@ -9781,16 +9821,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &1029817523774987629 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5688246229370211124} - m_PrefabAsset: {fileID: 0} --- !u!1 &8240790560213506744 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5688246229370211124} m_PrefabAsset: {fileID: 0} +--- !u!224 &1029817523774987629 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5688246229370211124} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6281625263577488710 PrefabInstance: m_ObjectHideFlags: 0