diff --git a/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab b/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab index 46038ffa2b..a9607f562d 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab @@ -316,16 +316,16 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2692898917959277323} + - component: {fileID: 7023519117441382734} m_Layer: 0 - m_Name: buff_WDXXD 1 + m_Name: TongYong_Effect_buff_wudi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2692898917959277323 -Transform: +--- !u!224 &7023519117441382734 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -339,6 +339,11 @@ Transform: m_Father: {fileID: 0} 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5028713974176146044 GameObject: m_ObjectHideFlags: 0 @@ -5553,6 +5558,6 @@ Transform: - {fileID: 2709948177419360945} - {fileID: 2512203624190304090} - {fileID: 8584142683560691132} - m_Father: {fileID: 2692898917959277323} + m_Father: {fileID: 7023519117441382734} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index e3fcfe67b8..db5e817504 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -9799,12 +9799,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 7144930083889366428} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 7 + m_Father: {fileID: -7803108222865121850} + 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: -73, y: -86.000046} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &1572569323773417563 @@ -9854,9 +9854,10 @@ 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: -3258366035422410537} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 3 + 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} @@ -25577,15 +25578,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 99.9786} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: -3258366035422410537} - - {fileID: 2464737965211906784} - - {fileID: -7417218276520852801} - {fileID: -8859645987379613814} - {fileID: -100897375014412121} - {fileID: 7840477457502880242} - - {fileID: -7288508588859361142} - - {fileID: 3795882027273366937} - - {fileID: -3619418234783803351} - {fileID: -3928636227828066691} - {fileID: -7803108222865121850} - {fileID: -8474452437207042981} @@ -25623,9 +25618,10 @@ 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: -3619418234783803351} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 11 + 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} @@ -25845,12 +25841,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 6960185033272747284} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 2 + m_Father: {fileID: 7840477457502880242} + 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: 377, y: 143.99995} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &268233009513622496 @@ -33298,9 +33294,10 @@ 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: -7288508588859361142} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 9 + 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} @@ -44398,9 +44395,10 @@ 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: 2464737965211906784} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 4 + 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} @@ -44708,16 +44706,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1004967687612880886} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalPosition: {x: 0, y: 0, z: 98.9786} m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 4060928337411048415} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 5 + m_Father: {fileID: 8011628067624866770} + 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: 77, y: 142.99997} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4823737723693298344 @@ -44833,7 +44831,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3360585188075601704 RectTransform: m_ObjectHideFlags: 0 @@ -44847,7 +44845,7 @@ RectTransform: m_Children: - {fileID: 4449728987535257064} m_Father: {fileID: 4330148323958158182} - m_RootOrder: 0 + 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} @@ -44908,7 +44906,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4127916411277389435 RectTransform: m_ObjectHideFlags: 0 @@ -44922,7 +44920,7 @@ RectTransform: m_Children: - {fileID: 3813825261449738182} m_Father: {fileID: 8011628067624866770} - m_RootOrder: 0 + 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} @@ -60059,12 +60057,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 2578355701318810613} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 1 + m_Father: {fileID: -100897375014412121} + 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: 77, y: 143.99995} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-4340789554266929400 @@ -79729,7 +79727,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &890082298661879197 RectTransform: m_ObjectHideFlags: 0 @@ -79743,7 +79741,7 @@ RectTransform: m_Children: - {fileID: 5542171691843067784} m_Father: {fileID: 4053770132861701690} - m_RootOrder: 0 + 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} @@ -80376,9 +80374,10 @@ 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: -7417218276520852801} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 5 + 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} @@ -87875,7 +87874,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &666760566860824669 RectTransform: m_ObjectHideFlags: 0 @@ -87889,7 +87888,7 @@ RectTransform: m_Children: - {fileID: -3222148989548170810} m_Father: {fileID: 3198430005102515251} - m_RootOrder: 0 + 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} @@ -88185,12 +88184,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 3217903925305295122} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 6 + m_Father: {fileID: -3928636227828066691} + 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: -373, y: -86.000046} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-2841052192673379441 @@ -103930,9 +103929,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7786658268145073970} - {fileID: 3360585188075601704} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 12 + 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} @@ -128131,9 +128131,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6585631384616885062} - {fileID: 7502186766485076338} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 8 + 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} @@ -157548,12 +157549,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 834692241} - - {fileID: 7485940279673153507} - - {fileID: 6585631384616885062} - - {fileID: 4417892464660579975} - - {fileID: 2593633115569930101} - - {fileID: 5541316517095428245} - - {fileID: 7786658268145073970} - {fileID: 3198430005102515251} - {fileID: 4733835317090964167} - {fileID: 4053770132861701690} @@ -157735,12 +157730,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 3173719562454643619} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 8 + m_Father: {fileID: -8474452437207042981} + 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: 227, y: -86.000046} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-3362569938017948774 @@ -157793,12 +157788,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 8339478454819500014} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 3 + m_Father: {fileID: 3198430005102515251} + 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: 227, y: 448.99994} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3681946865722538890 @@ -178755,7 +178750,7 @@ RectTransform: - {fileID: 3691979404969139093} - {fileID: 631228591500787782} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 14 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -179935,9 +179930,10 @@ 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: 3795882027273366937} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 10 + 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} @@ -179973,12 +179969,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 1691281247155542861} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 1 + m_Father: {fileID: 4053770132861701690} + 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: -373, y: 448.99994} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &8683155064434081473 @@ -180216,9 +180212,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7485940279673153507} - {fileID: 890082298661879197} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 9 + 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} @@ -180383,12 +180380,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: -8409425785127076249} - m_Father: {fileID: 4104790940082786943} + m_Father: {fileID: -8859645987379613814} 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: -223, y: 144} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-35742711196225680 @@ -180663,7 +180660,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7502186766485076338 RectTransform: m_ObjectHideFlags: 0 @@ -180677,7 +180674,7 @@ RectTransform: m_Children: - {fileID: 5441369409000555912} m_Father: {fileID: 4733835317090964167} - m_RootOrder: 0 + 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} @@ -185831,7 +185828,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8032969764776295951} - m_RootOrder: 13 + 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} @@ -215628,12 +215625,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 5298674135033318747} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 6 + m_Father: {fileID: 4330148323958158182} + 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: 377, y: 142.99997} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3196897155070244967 @@ -220453,7 +220450,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2069895754318839184 RectTransform: m_ObjectHideFlags: 0 @@ -220467,7 +220464,7 @@ RectTransform: m_Children: - {fileID: 6751140669436849440} m_Father: {fileID: 8665821495714301826} - m_RootOrder: 0 + 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} @@ -220540,12 +220537,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 9139396969791315054} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 4 + m_Father: {fileID: 8665821495714301826} + 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: -223, y: 143} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3329905336858514894 @@ -220596,9 +220593,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5541316517095428245} - {fileID: 4127916411277389435} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 11 + 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} @@ -220917,9 +220915,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4417892464660579975} - {fileID: 666760566860824669} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 7 + 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} @@ -231754,12 +231753,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 176820800635632652} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 2 + m_Father: {fileID: 4733835317090964167} + 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: -73, y: 448.99994} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &6752199970212708454 @@ -236588,9 +236587,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2593633115569930101} - {fileID: 2069895754318839184} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 10 + 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} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index a922f8d739..0bf3d03cfb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -645,9 +645,9 @@ function this.BattleOrderChange(order) enemyPos.localScale = Vector3.zero enemyLivePos.localScale = Vector3.zero - local myPos = Util.GetTransform(this.PlayerPanel,i.."/root") - myPos:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan") - myPos.localScale = Vector3.one + -- local myPos = Util.GetTransform(this.PlayerPanel,tostring(i))--.."/root") + -- myPos:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan") + -- myPos.localScale = Vector3.one end end @@ -655,7 +655,7 @@ end function this.OnAddRole(data) local go if data.camp == 0 then - local parent = Util.GetTransform(this.PlayerPanel,data.position.."/root") + local parent = Util.GetTransform(this.PlayerPanel,tostring(data.position))--.."/root") go = BattlePool.GetItem(parent, BATTLE_POOL_TYPE.MY_ROLE) playerHP = playerHP + data:GetRoleData(RoleDataName.Hp) playerMaxHP = playerMaxHP + data:GetRoleData(RoleDataName.MaxHp) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index da79525e03..b25e49cf69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -125,7 +125,7 @@ function BuffCtrl:AddBuffEffect(buffName, isTrigger, offset) -- node.transform.localScale = Vector3.one node.transform:SetParent(self.owner.GameObject.transform) node.transform.localScale = Vector3.one - node.transform.localPosition = offset and Vector3.New(offset[1], offset[2], 0) or Vector3.zero--self.GameObject.transform.localPosition + node.transform.localPosition = offset and Vector3.New(offset[1], offset[2] + 50, 0) or Vector3.New(0, 50, 0)--self.GameObject.transform.localPosition self.BuffEffectList[buffName].node = node end self.BuffEffectList[buffName].node:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index a3d8b90f70..e3740d151c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -69,6 +69,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.nameText.text = SubString2(self.readingName,9) self.level.text = role:GetRoleData(RoleDataName.Level) self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element)) + LogError("加战斗ID::::"..tostring(self.enemysId)) if self.enemysId and self.enemysId==1017 then Util.GetGameObject(go, "Name"):GetComponent("RectTransform").anchoredPosition=Vector3.New(20,-180,0) Util.GetGameObject(go, "Pro"):GetComponent("RectTransform").anchoredPosition=Vector3.New(-77,-180,0) @@ -313,7 +314,7 @@ function EnemyView:DoScale(scale, dur, func) end --local liveScale = self.role.position <= 3 and 0.6 or 0.5 local liveScale=0.6 - self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) + -- self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index fa5d537975..bf169fa1f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -106,7 +106,6 @@ function PlayerView:onCreate(go, role, position, root) self.RoleLiveGOTran.sizeDelta = Vector2.New(1000, 1000) self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic") self.RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true) - --self.RootPanel.PlayerPanel, "live_"..position self.RoleLiveGO:SetActive(true) -- 卡牌立绘显示 @@ -162,9 +161,9 @@ function PlayerView:onCreate(go, role, position, root) self.rageText.text = "" self.lvHpObj=Util.GetGameObject(go, "lvObj") if position<=3 then - self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,385,0) + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,469,0) else - self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,-100,0) + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,0,0) end -- 伤害文字显示 self.LastBuffFloatingTime = Time.realtimeSinceStartup @@ -326,7 +325,7 @@ function PlayerView:DoScale(scale, dur, func) end --local liveScale = self.role.position <= 3 and 0.6 or 0.5 local liveScale = 0.6 - self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) + -- self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) end --角色被放逐