Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

Assets/arts/atlas/icon/skill_buff.asset

@@ -70,4 +70,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 58b5441136017ef418dcb148b831feed, type: 3}
   - {fileID: 21300000, guid: 0d8f3f351c407c043a31f3ce30e7d8ef, type: 3}
   - {fileID: 21300000, guid: 688f3dc14b978ce418a6d77e807e22f3, type: 3}
-  spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f060000800600008106000082060000830600008406000085060000350000009b0600009c0600009d0600009e0600009f06000036000000370000003800000039000000df0dcedbe00dcedbe10dcedb
+  spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f060000800600008106000082060000830600008406000085060000350000009b0600009c0600009d0600009e0600009f06000036000000370000003800000039000000e00dcedbe10dcedbe20dcedb

Assets/arts/atlas/icon/skill_buff.spriteatlas

@@ -126,9 +126,9 @@ SpriteAtlas:
   - 46
   - 53
   - 30
-  - frame_1
+  - frame_2
   - 11
-  - frame_3
+  - frame_4
   - 49
   - 43
   - 36
@@ -146,7 +146,7 @@ SpriteAtlas:
   - 13
   - 52
   - 18
-  - frame_2
+  - frame_3
   - 39
   - 33
   - 25

Assets/arts/atlas/ui/battle.asset

@@ -42,6 +42,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 35d30742d8a5d0641a6e7b0b18f323a1, type: 3}
   - {fileID: 21300000, guid: 8dac4cd77ddbe4544b8a44602bb5c9be, type: 3}
   - {fileID: 21300000, guid: 045a5a4df9f45a748851f849cac3f835, type: 3}
+  - {fileID: 21300000, guid: 6110768d2c1a677419fe61d0f7a1ab0d, type: 3}
+  - {fileID: 21300000, guid: 2ac6685652497304e92e5d80a0e2b523, type: 3}
   - {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3}
   - {fileID: 21300000, guid: 67bbbb8c1478fd2499c68c245a3aadcf, type: 3}
   - {fileID: 21300000, guid: 3ad86f0f900c9f64ab2165d92f8d49e5, type: 3}
@@ -50,26 +52,17 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 6e0fd41cbc1e6f44e82bedc0d5a92b54, type: 3}
   - {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3}
   - {fileID: 21300000, guid: 816486ca69b027b4bb3438882fd42f2b, type: 3}
-  - {fileID: 21300000, guid: c075c1d8a6c29884aafa605fbcea0776, type: 3}
-  - {fileID: 21300000, guid: b1712527930c5ec4a84da1695e1112f4, type: 3}
   - {fileID: 21300000, guid: 77026c4d6ad5e0f4d941920a0ef3f272, type: 3}
   - {fileID: 21300000, guid: 1421585b364b1fb4ab0d951bb5d0f35d, type: 3}
   - {fileID: 21300000, guid: 9bb2f10b15aa44a4fa22ec0655146511, type: 3}
-  - {fileID: 21300000, guid: 1fb00d985f6c0514798f2eb8fde2b62e, type: 3}
   - {fileID: 21300000, guid: 634f8eff83cb4cd4780e6afae3bc6c65, type: 3}
-  - {fileID: 21300000, guid: 7309a9fe165592c4ea0932fec56f6e69, type: 3}
   - {fileID: 21300000, guid: d135766030d953b4bbb3ca2404fe28da, type: 3}
-  - {fileID: 21300000, guid: e4f472bac902dc6489a98e2892d0a87f, type: 3}
   - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3}
-  - {fileID: 21300000, guid: 6a2cd2e9a6a27184485a638d11ec7cb9, type: 3}
   - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3}
-  - {fileID: 21300000, guid: 9e28515bd500bad43b36cc7ef5d5ce9d, type: 3}
   - {fileID: 21300000, guid: 39113fce63ffd9945a6dfe5e07e68860, type: 3}
   - {fileID: 21300000, guid: 57fe3e738dd3f60468018d5b59470fa0, type: 3}
   - {fileID: 21300000, guid: d03a08a450d45584cb6dfb67dd6df6ba, type: 3}
-  - {fileID: 21300000, guid: 8530e01234199564daeedf175cc20937, type: 3}
   - {fileID: 21300000, guid: 52ac764cef5804147aa8efe734be0a01, type: 3}
-  - {fileID: 21300000, guid: ebfdd7936b9f13340acc2ccd55ee5b1f, type: 3}
   - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3}
   - {fileID: 21300000, guid: b78c059420cc8364daadb27686bc1242, type: 3}
-  spriteNameList: 919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136501d54ed3ede09396eee09396efe09396f0e09396bd9b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba1e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b85923031d92d5041d92d583b74c9784b74c978c8d63ad3e66b6e2f525e9106788377b8b9601007d2bf6056e14a268a0bc6ec803e47506f5fa8c4075a87fcae76a372976a87fcaa86e3729aa3b3700dc0457cf2623b5b658fdf8dd
+  spriteNameList: 919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136501d54ed3ede09396eee09396efe09396f0e09396bd9b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63adf525e9108b9601006e14a26803e4750675a87fcae76a372976a87fcaaa3b37002623b5b658fdf8dd

Assets/arts/atlas/ui/battle.spriteatlas

@@ -77,15 +77,14 @@ SpriteAtlas:
   - {fileID: 21300000, guid: d03a08a450d45584cb6dfb67dd6df6ba, type: 3}
   - {fileID: 21300000, guid: 6977af166b59e254a869ca5639e56bec, type: 3}
   - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3}
+  - {fileID: 21300000, guid: 2ac6685652497304e92e5d80a0e2b523, type: 3}
   - {fileID: 21300000, guid: fe047417c1765ae408c718cdde9c74a8, type: 3}
-  - {fileID: 21300000, guid: b1712527930c5ec4a84da1695e1112f4, type: 3}
   - {fileID: 21300000, guid: 0ebd413772dcdd44aacc3aa4882d9db9, type: 3}
   - {fileID: 21300000, guid: 306205473d3cf1f4a9d821c3e2971092, type: 3}
   - {fileID: 21300000, guid: 0928e747552d400468dcd7ba0a5cf10a, type: 3}
   - {fileID: 21300000, guid: 8dac4cd77ddbe4544b8a44602bb5c9be, type: 3}
   - {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3}
   - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3}
-  - {fileID: 21300000, guid: c075c1d8a6c29884aafa605fbcea0776, type: 3}
   - {fileID: 21300000, guid: 331e6bd86c6815246bbdc3582757afde, type: 3}
   - {fileID: 21300000, guid: f37b1779751e6de42b14f4d4c8f52609, type: 3}
   - {fileID: 21300000, guid: 2deaa61a5f1d4fd44b611e3d5819ce7a, type: 3}
@@ -104,6 +103,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 77026c4d6ad5e0f4d941920a0ef3f272, type: 3}
   - {fileID: 21300000, guid: cd8cf65d131e4bf44a2d7c37bfe60080, type: 3}
   - {fileID: 21300000, guid: 10dac87d52e3e6647ad3d1644b607922, type: 3}
+  - {fileID: 21300000, guid: 6110768d2c1a677419fe61d0f7a1ab0d, type: 3}
   - {fileID: 21300000, guid: 421fe68d394a55b45bb37d332f312805, type: 3}
   - {fileID: 21300000, guid: 39cd734eccabde14fb2c3cffddc8d39a, type: 3}
   - {fileID: 21300000, guid: dfc7b64e38bed054fb7f4ae52e1586d6, type: 3}
@@ -130,15 +130,14 @@ SpriteAtlas:
   - snow_2
   - battle_progress_4
   - battle_progress_1
+  - battle_skill_bg_purple_2
   - battle_board_1
-  - battle_skill_purple_2
   - battle_progress_bg_2
   - battle_btn_setting
   - battle_dec_3
   - battle_skill_bg_green_1
   - battle_skill_bg_red_1
   - red_1
-  - battle_skill_purple_1
   - battle_progress_bg_1
   - battle_board_7
   - battle_line_1
@@ -157,6 +156,7 @@ SpriteAtlas:
   - battle_title_1
   - battle_dec_4
   - battle_hinder_1
+  - battle_skill_bg_purple_1
   - battle_board_6
   - battle_board_3
   - battle_dec_2

Assets/arts/textures/icon/skill_buff/frame_2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0d8f3f351c407c043a31f3ce30e7d8ef
+guid: 58b5441136017ef418dcb148b831feed
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/arts/textures/icon/skill_buff/frame_3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 688f3dc14b978ce418a6d77e807e22f3
+guid: 0d8f3f351c407c043a31f3ce30e7d8ef
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/arts/textures/icon/skill_buff/frame_4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 58b5441136017ef418dcb148b831feed
+guid: 688f3dc14b978ce418a6d77e807e22f3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/arts/textures/ui/battle/battle_skill_bg_purple_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c075c1d8a6c29884aafa605fbcea0776
+guid: 6110768d2c1a677419fe61d0f7a1ab0d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/arts/textures/ui/battle/battle_skill_bg_purple_2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b1712527930c5ec4a84da1695e1112f4
+guid: 2ac6685652497304e92e5d80a0e2b523
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/prefabs/ui/battle/cell/skill_select_cell.prefab

@@ -355,8 +355,8 @@ GameObject:
   - component: {fileID: 5179483422155937763}
   - component: {fileID: 2341122389065458226}
   - component: {fileID: 1487520979074871465}
-  - component: {fileID: 9104723194670785685}
+  - component: {fileID: 2774013824427998309}
-  - component: {fileID: 1945404522398777861}
+  - component: {fileID: 1977101783536767864}
   m_Layer: 5
   m_Name: skill_select_cell
   m_TagString: Untagged
@@ -431,7 +431,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8920710045876662240}
   m_CullTransparentMesh: 1
---- !u!114 &9104723194670785685
+--- !u!114 &2774013824427998309
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -440,10 +440,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 8920710045876662240}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  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}
@@ -451,7 +451,17 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &1945404522398777861
+  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 &1977101783536767864
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

Assets/prefabs/ui/hero/hero_detail_ui.prefab

@@ -75,6 +75,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &426104903512247441
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7974301486538712500}
+  - component: {fileID: 468885457099527763}
+  - component: {fileID: 8904623103341131403}
+  m_Layer: 5
+  m_Name: match_bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7974301486538712500
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426104903512247441}
+  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: 3423933033153386276}
+  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: 0}
+  m_SizeDelta: {x: 62, y: 62}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &468885457099527763
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426104903512247441}
+  m_CullTransparentMesh: 1
+--- !u!114 &8904623103341131403
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426104903512247441}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 0
+  m_FillOrigin: 2
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &525974986252757276
 GameObject:
   m_ObjectHideFlags: 0
@@ -373,6 +448,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 7895290726229652625}
   - {fileID: 280581360292912021}
   m_Father: {fileID: 3121552964615492639}
   m_RootOrder: 16
@@ -865,6 +941,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 4673485989299599566}
   - {fileID: 8912643895431753425}
   m_Father: {fileID: 3121552964615492639}
   m_RootOrder: 14
@@ -1075,6 +1152,114 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2179178577272225086
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3423933033153386276}
+  - component: {fileID: 2225766192804288032}
+  - component: {fileID: 5053606604554569721}
+  - component: {fileID: 143581846155477412}
+  m_Layer: 5
+  m_Name: skill_node
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3423933033153386276
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179178577272225086}
+  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: 6064688861426198179}
+  - {fileID: 7974301486538712500}
+  - {fileID: 3233627241191039800}
+  m_Father: {fileID: 3121552964615492639}
+  m_RootOrder: 13
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 257, y: -165}
+  m_SizeDelta: {x: 62, y: 62}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2225766192804288032
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179178577272225086}
+  m_CullTransparentMesh: 1
+--- !u!114 &5053606604554569721
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179178577272225086}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: e8a869bf5b5b1a2469b54cc718b6642e, 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 &143581846155477412
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179178577272225086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  prefabList:
+  - name: skill_node_cell.energy_bg
+    hashName: 3465911487
+    objectType: 0
+    gameObject: {fileID: 9123626230249313618}
+  - name: skill_node_cell.match_bg
+    hashName: 1823949116
+    objectType: 0
+    gameObject: {fileID: 426104903512247441}
+  - name: skill_node_cell.mask
+    hashName: 1792108969
+    objectType: 0
+    gameObject: {fileID: 0}
+  - name: skill_node_cell.skill_icon
+    hashName: 210933412
+    objectType: 0
+    gameObject: {fileID: 0}
 --- !u!1 &2522028408381821815
 GameObject:
   m_ObjectHideFlags: 0
@@ -1448,6 +1633,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 6766321168493007031}
   - {fileID: 1446882836496066191}
   m_Father: {fileID: 3121552964615492639}
   m_RootOrder: 15
@@ -1538,7 +1724,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7132963117359464939}
-  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}
@@ -1926,6 +2112,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4017915383079728665
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7895290726229652625}
+  - component: {fileID: 4340875457006657818}
+  - component: {fileID: 5570619245718014900}
+  m_Layer: 5
+  m_Name: icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7895290726229652625
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4017915383079728665}
+  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: 6378431467282090021}
+  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!222 &4340875457006657818
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4017915383079728665}
+  m_CullTransparentMesh: 1
+--- !u!114 &5570619245718014900
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4017915383079728665}
+  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: 0
+  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!1 &4137608449858171056
 GameObject:
   m_ObjectHideFlags: 0
@@ -2177,7 +2438,7 @@ RectTransform:
   - {fileID: 3440179668503020950}
   - {fileID: 4129954008236536413}
   - {fileID: 5192740225468937621}
-  - {fileID: 3233627241191039800}
+  - {fileID: 3423933033153386276}
   - {fileID: 8508180153801302961}
   - {fileID: 7132963117359464939}
   - {fileID: 6378431467282090021}
@@ -2818,6 +3079,18 @@ MonoBehaviour:
     hashName: 4189814588
     objectType: 0
     gameObject: {fileID: 8560581862817186025}
+  - name: hero_detail_ui.bg.skill_up_1.icon
+    hashName: 1812158580
+    objectType: 0
+    gameObject: {fileID: 6431225084991062311}
+  - name: hero_detail_ui.bg.skill_up_2.icon
+    hashName: 1840787731
+    objectType: 0
+    gameObject: {fileID: 7635230539258825668}
+  - name: hero_detail_ui.bg.skill_up_3.icon
+    hashName: 1869416882
+    objectType: 0
+    gameObject: {fileID: 4017915383079728665}
 --- !u!114 &5438448160771658672
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2878,7 +3151,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8508180153801302961}
-  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}
@@ -3012,7 +3285,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6378431467282090021}
-  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}
@@ -3116,6 +3389,81 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6431225084991062311
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4673485989299599566}
+  - component: {fileID: 2667788329616600743}
+  - component: {fileID: 8505086588399305975}
+  m_Layer: 5
+  m_Name: icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4673485989299599566
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6431225084991062311}
+  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: 8508180153801302961}
+  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!222 &2667788329616600743
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6431225084991062311}
+  m_CullTransparentMesh: 1
+--- !u!114 &8505086588399305975
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6431225084991062311}
+  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: 0
+  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!1 &7152384223298841715
 GameObject:
   m_ObjectHideFlags: 0
@@ -3295,12 +3643,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_Father: {fileID: 3423933033153386276}
-  m_RootOrder: 13
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 226, y: -134}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 62, y: 62}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3835241959496021214
@@ -3341,6 +3689,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7635230539258825668
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6766321168493007031}
+  - component: {fileID: 1424539916060369046}
+  - component: {fileID: 8846181549095500344}
+  m_Layer: 5
+  m_Name: icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6766321168493007031
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7635230539258825668}
+  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: 7132963117359464939}
+  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!222 &1424539916060369046
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7635230539258825668}
+  m_CullTransparentMesh: 1
+--- !u!114 &8846181549095500344
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7635230539258825668}
+  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: 0
+  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!1 &7720959723998496488
 GameObject:
   m_ObjectHideFlags: 0
@@ -4091,3 +4514,78 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   IsShowClickAnimation: 1
+--- !u!1 &9123626230249313618
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6064688861426198179}
+  - component: {fileID: 4147861846709182714}
+  - component: {fileID: 721361355630957321}
+  m_Layer: 5
+  m_Name: energy_bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6064688861426198179
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9123626230249313618}
+  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: 3423933033153386276}
+  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: 62, y: 62}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4147861846709182714
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9123626230249313618}
+  m_CullTransparentMesh: 1
+--- !u!114 &721361355630957321
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9123626230249313618}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 829c31a0f5439a94caee22785f2edfdc, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 2
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1