diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index b329b43b8..dc70e468a 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/common/local_data.lua.bytes b/Assets/lua/app/common/local_data.lua.bytes index f2c96ae82..1dfff9010 100644 Binary files a/Assets/lua/app/common/local_data.lua.bytes and b/Assets/lua/app/common/local_data.lua.bytes differ diff --git a/Assets/lua/app/common/pay_manager.lua.bytes b/Assets/lua/app/common/pay_manager.lua.bytes index f57b74a38..6e08e17c9 100644 Binary files a/Assets/lua/app/common/pay_manager.lua.bytes and b/Assets/lua/app/common/pay_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_manager.lua.bytes b/Assets/lua/app/common/sdk_manager.lua.bytes index 883974cb5..f93853e30 100644 Binary files a/Assets/lua/app/common/sdk_manager.lua.bytes and b/Assets/lua/app/common/sdk_manager.lua.bytes differ diff --git a/Assets/lua/app/first/first.lua.bytes b/Assets/lua/app/first/first.lua.bytes index 644ba9232..c9eb38f45 100644 Binary files a/Assets/lua/app/first/first.lua.bytes and b/Assets/lua/app/first/first.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index 0ae580955..2f4d47618 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/formation/formation_manager.lua.bytes b/Assets/lua/app/module/formation/formation_manager.lua.bytes index 1f0ab696e..1b6213d2c 100644 Binary files a/Assets/lua/app/module/formation/formation_manager.lua.bytes and b/Assets/lua/app/module/formation/formation_manager.lua.bytes differ diff --git a/Assets/lua/app/module/hero/hero_manager.lua.bytes b/Assets/lua/app/module/hero/hero_manager.lua.bytes index 02a7f7a0b..0bada7a0f 100644 Binary files a/Assets/lua/app/module/hero/hero_manager.lua.bytes and b/Assets/lua/app/module/hero/hero_manager.lua.bytes differ diff --git a/Assets/lua/app/module/login/login_manager.lua.bytes b/Assets/lua/app/module/login/login_manager.lua.bytes index 7201110c6..6fb9ed8e7 100644 Binary files a/Assets/lua/app/module/login/login_manager.lua.bytes and b/Assets/lua/app/module/login/login_manager.lua.bytes differ diff --git a/Assets/lua/app/module/tips/tips_manager.lua.bytes b/Assets/lua/app/module/tips/tips_manager.lua.bytes index 14b5175d8..3412cd441 100644 Binary files a/Assets/lua/app/module/tips/tips_manager.lua.bytes and b/Assets/lua/app/module/tips/tips_manager.lua.bytes differ diff --git a/Assets/lua/app/net/net_manager.lua.bytes b/Assets/lua/app/net/net_manager.lua.bytes index 0a64a6d70..9263135b5 100644 Binary files a/Assets/lua/app/net/net_manager.lua.bytes and b/Assets/lua/app/net/net_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes index ad631326e..812b604e4 100644 Binary files a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes index 3b8bd3626..e2b90d8c4 100644 Binary files a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes and b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes b/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes index 3ba20edac..36fd87b15 100644 Binary files a/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes and b/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes index e00bd2ea7..388c3f6e0 100644 Binary files a/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 4df359066..bf4628127 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/shop_comp.lua.bytes b/Assets/lua/app/ui/shop/shop_comp.lua.bytes index ee9744125..295522b65 100644 Binary files a/Assets/lua/app/ui/shop/shop_comp.lua.bytes and b/Assets/lua/app/ui/shop/shop_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/ui_manager.lua.bytes b/Assets/lua/app/ui/ui_manager.lua.bytes index 8f2227c17..25043bee4 100644 Binary files a/Assets/lua/app/ui/ui_manager.lua.bytes and b/Assets/lua/app/ui/ui_manager.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes b/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes index 4adb9302e..17cba552e 100644 Binary files a/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes and b/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/formation/formation_data.lua.bytes b/Assets/lua/app/userdata/formation/formation_data.lua.bytes index ca952d3ab..8be845d11 100644 Binary files a/Assets/lua/app/userdata/formation/formation_data.lua.bytes and b/Assets/lua/app/userdata/formation/formation_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index 944ea8a11..d3c0b7456 100644 Binary files a/Assets/lua/app/userdata/hero/hero_data.lua.bytes and b/Assets/lua/app/userdata/hero/hero_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/player/player_data.lua.bytes b/Assets/lua/app/userdata/player/player_data.lua.bytes index be7a36cc5..296585b65 100644 Binary files a/Assets/lua/app/userdata/player/player_data.lua.bytes and b/Assets/lua/app/userdata/player/player_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/shop/shop_data.lua.bytes b/Assets/lua/app/userdata/shop/shop_data.lua.bytes index f2d6b257b..fac826072 100644 Binary files a/Assets/lua/app/userdata/shop/shop_data.lua.bytes and b/Assets/lua/app/userdata/shop/shop_data.lua.bytes differ diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index 7050dc120..24416c4af 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -105,7 +105,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 26 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -376,11 +376,11 @@ RectTransform: - {fileID: 7895290726229652625} - {fileID: 280581360292912021} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 18 + m_RootOrder: 17 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: -149} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -620} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &990446035579644994 @@ -434,45 +434,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &765806316508070464 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5829434431374870197} - m_Layer: 5 - m_Name: spine_node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5829434431374870197 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765806316508070464} - 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: 6629456022564667523} - - {fileID: 5264852851106824938} - - {fileID: 7467862993939628122} - - {fileID: 5637289209986445403} - m_Father: {fileID: 3121552964615492639} - m_RootOrder: 33 - 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 &936001342816146566 GameObject: m_ObjectHideFlags: 0 @@ -503,7 +464,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 32 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -637,11 +598,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 25 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 6} + m_AnchoredPosition: {x: 0, y: 6.000244} m_SizeDelta: {x: 200, y: 36} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6243960342465554854 @@ -771,7 +732,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 28 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -908,11 +869,11 @@ RectTransform: - {fileID: 4291897593288585646} - {fileID: 3597170769462245813} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 20 + m_RootOrder: 19 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: 212, y: -149} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 212, y: -620} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6354041856930263010 @@ -999,11 +960,11 @@ RectTransform: - {fileID: 7293583849349973633} - {fileID: 7019497958006880290} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 19 + m_RootOrder: 18 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: 106, y: -149} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 106, y: -620} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7445528765640808247 @@ -1090,11 +1051,11 @@ RectTransform: - {fileID: 4673485989299599566} - {fileID: 8912643895431753425} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 16 + m_RootOrder: 15 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: -212, y: -149} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -212, y: -620} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4056061354735087138 @@ -1328,7 +1289,7 @@ RectTransform: m_Children: - {fileID: 3233627241191039800} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1373,7 +1334,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 29 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1507,7 +1468,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1850,7 +1811,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1928,11 +1889,11 @@ RectTransform: - {fileID: 6766321168493007031} - {fileID: 1446882836496066191} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 17 + m_RootOrder: 16 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: -106, y: -149} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -106, y: -620} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4356033973048536663 @@ -2094,11 +2055,11 @@ RectTransform: - {fileID: 6641103056862691650} - {fileID: 2344038628239825686} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 22 + m_RootOrder: 21 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: -106, y: -240} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -106, y: -711} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9183344317358987470 @@ -2450,11 +2411,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 54.2, y: 372.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 54.2, y: -98.79999} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1456058682979890450 @@ -2600,7 +2561,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 27 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2704,6 +2665,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4164006251857065673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6560838161292652952} + m_Layer: 5 + m_Name: down + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6560838161292652952 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4164006251857065673} + 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: 4752038755234961756} + - {fileID: 1641418511942259705} + m_Father: {fileID: 3121552964615492639} + m_RootOrder: 9 + 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 &4336955921054251095 GameObject: m_ObjectHideFlags: 0 @@ -2733,12 +2731,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3121552964615492639} - m_RootOrder: 3 + m_Father: {fileID: 6560838161292652952} + 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: -294} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -765} m_SizeDelta: {x: 589, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5725273737647947288 @@ -2810,8 +2808,6 @@ RectTransform: m_Children: - {fileID: 6306019015938117602} - {fileID: 2063158863154154278} - - {fileID: 1641418511942259705} - - {fileID: 4752038755234961756} - {fileID: 4969499635735349051} - {fileID: 8243974960864512853} - {fileID: 6592573833229225066} @@ -2819,6 +2815,7 @@ RectTransform: - {fileID: 6708055227925792670} - {fileID: 1921541548618611738} - {fileID: 8474223097521515840} + - {fileID: 6560838161292652952} - {fileID: 3130305236544273018} - {fileID: 7517304374616493014} - {fileID: 3440179668503020950} @@ -2841,7 +2838,10 @@ RectTransform: - {fileID: 8858472983762581176} - {fileID: 189167395446950824} - {fileID: 1031846887667425403} - - {fileID: 5829434431374870197} + - {fileID: 6629456022564667523} + - {fileID: 5264852851106824938} + - {fileID: 7467862993939628122} + - {fileID: 5637289209986445403} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2918,11 +2918,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 6 + 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: -133, y: -56} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -133, y: -526.99994} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3693407373230547367 @@ -2988,16 +2988,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4615558990665828946} - 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: 5829434431374870197} - m_RootOrder: 1 + m_Father: {fileID: 3121552964615492639} + m_RootOrder: 33 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: 28, y: 94} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 28, y: -377} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4879953812073206630 @@ -3084,16 +3084,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5127045946293745891} - 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: 5829434431374870197} - m_RootOrder: 3 + m_Father: {fileID: 3121552964615492639} + m_RootOrder: 35 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: 140} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -331} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4941076948335026647 @@ -3185,7 +3185,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3260,11 +3260,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 5 + 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: 0.75, y: 40} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.75, y: -431} m_SizeDelta: {x: 504.5, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4230029146921314189 @@ -3335,7 +3335,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 31 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3470,11 +3470,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 24 + m_RootOrder: 23 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: -554} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -83} m_SizeDelta: {x: 102, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1115906215498402370 @@ -3558,11 +3558,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 4 + 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: 0, y: 97} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -374} m_SizeDelta: {x: 589, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3657267741095896056 @@ -3819,20 +3819,20 @@ MonoBehaviour: hashName: 1869416882 objectType: 0 gameObject: {fileID: 4017915383079728665} - - name: hero_detail_ui.bg.spine_node.ui_spine_obj_skill - hashName: 1620119738 + - name: hero_detail_ui.bg.ui_spine_obj_skill + hashName: 2482064602 objectType: 6 gameObject: {fileID: 6133285403699513403} - - name: hero_detail_ui.bg.spine_node.ui_spine_obj_lv - hashName: 1325696961 + - name: hero_detail_ui.bg.ui_spine_obj_lv + hashName: 122339233 objectType: 6 gameObject: {fileID: 4615558990665828946} - - name: hero_detail_ui.bg.spine_node.ui_spine_obj - hashName: 727093608 + - name: hero_detail_ui.bg.ui_spine_obj + hashName: 2317247880 objectType: 6 gameObject: {fileID: 5127045946293745891} - - name: hero_detail_ui.bg.spine_node.ui_spine_obj_avatar - hashName: 2473674768 + - name: hero_detail_ui.bg.ui_spine_obj_avatar + hashName: 3424161776 objectType: 6 gameObject: {fileID: 7979934779780696290} - name: hero_detail_ui.bg.skill_up_4 @@ -3883,6 +3883,14 @@ MonoBehaviour: hashName: 1983786566 objectType: 0 gameObject: {fileID: 7187277064658910726} + - name: hero_detail_ui.bg.down + hashName: 392265466 + objectType: 0 + gameObject: {fileID: 4164006251857065673} + - name: hero_detail_ui.bg + hashName: 1830571158 + objectType: 0 + gameObject: {fileID: 4446817925623129322} --- !u!114 &5438448160771658672 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4072,16 +4080,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6133285403699513403} - 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: 5829434431374870197} - m_RootOrder: 0 + m_Father: {fileID: 3121552964615492639} + m_RootOrder: 32 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: -169} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -640} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6244549596187037967 @@ -4519,11 +4527,11 @@ RectTransform: - {fileID: 8236069155013665049} - {fileID: 5945189979382510167} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 21 + 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: -212, y: -240} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -212, y: -711} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6993429477031457749 @@ -4607,7 +4615,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4968,10 +4976,10 @@ RectTransform: m_Father: {fileID: 3121552964615492639} 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.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 18} - m_SizeDelta: {x: 611, y: 942} + m_SizeDelta: {x: 611, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2326150237526586076 CanvasRenderer: @@ -5191,7 +5199,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 30 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -5394,11 +5402,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 19, y: 30} + m_AnchoredPosition: {x: 19, y: 30.00055} m_SizeDelta: {x: 616, y: 95} m_Pivot: {x: 0, y: 1} --- !u!222 &4959923353717304467 @@ -5464,16 +5472,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7979934779780696290} - 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: 5829434431374870197} - m_RootOrder: 2 + m_Father: {fileID: 3121552964615492639} + m_RootOrder: 34 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: 147} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -324} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7857297243560055254 @@ -5639,12 +5647,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3121552964615492639} - m_RootOrder: 2 + m_Father: {fileID: 6560838161292652952} + 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: 0, y: -442} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -913} m_SizeDelta: {x: 589, y: 146} m_Pivot: {x: 0.5, y: 0} --- !u!222 &551622607854556888 @@ -5718,7 +5726,7 @@ RectTransform: - {fileID: 2340224635711650662} - {fileID: 6129097968792476662} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5795,9 +5803,9 @@ RectTransform: m_Father: {fileID: 3121552964615492639} 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: 0, y: 266} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -205} m_SizeDelta: {x: 589, y: 334} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2934882046724420640 @@ -5999,11 +6007,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 7 + 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: 133, y: -56} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 133, y: -526.99994} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8188355070568033250 @@ -6080,7 +6088,7 @@ RectTransform: - {fileID: 5946699571563582250} - {fileID: 447667911392970790} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}