From c121247df810c7110ab2ca8f8fddceb78f12e566 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 18 Apr 2023 20:37:19 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/arts/atlas/icon/skill_buff.asset | 2 +- Assets/arts/atlas/icon/skill_buff.spriteatlas | 6 +- Assets/arts/atlas/ui/battle.asset | 13 +- Assets/arts/atlas/ui/battle.spriteatlas | 8 +- .../arts/textures/icon/skill_buff/frame_1.png | Bin 1942 -> 0 bytes .../arts/textures/icon/skill_buff/frame_2.png | Bin 1960 -> 1942 bytes .../textures/icon/skill_buff/frame_2.png.meta | 2 +- .../arts/textures/icon/skill_buff/frame_3.png | Bin 1968 -> 1960 bytes .../textures/icon/skill_buff/frame_3.png.meta | 2 +- .../arts/textures/icon/skill_buff/frame_4.png | Bin 0 -> 1968 bytes .../{frame_1.png.meta => frame_4.png.meta} | 2 +- ...ple_1.png => battle_skill_bg_purple_1.png} | Bin ...meta => battle_skill_bg_purple_1.png.meta} | 2 +- ...ple_2.png => battle_skill_bg_purple_2.png} | Bin ...meta => battle_skill_bg_purple_2.png.meta} | 2 +- .../ui/battle/cell/skill_select_cell.prefab | 22 +- Assets/prefabs/ui/hero/hero_detail_ui.prefab | 512 +++++++++++++++++- 17 files changed, 537 insertions(+), 36 deletions(-) delete mode 100644 Assets/arts/textures/icon/skill_buff/frame_1.png create mode 100644 Assets/arts/textures/icon/skill_buff/frame_4.png rename Assets/arts/textures/icon/skill_buff/{frame_1.png.meta => frame_4.png.meta} (98%) rename Assets/arts/textures/ui/battle/{battle_skill_purple_1.png => battle_skill_bg_purple_1.png} (100%) rename Assets/arts/textures/ui/battle/{battle_skill_purple_1.png.meta => battle_skill_bg_purple_1.png.meta} (98%) rename Assets/arts/textures/ui/battle/{battle_skill_purple_2.png => battle_skill_bg_purple_2.png} (100%) rename Assets/arts/textures/ui/battle/{battle_skill_purple_2.png.meta => battle_skill_bg_purple_2.png.meta} (98%) diff --git a/Assets/arts/atlas/icon/skill_buff.asset b/Assets/arts/atlas/icon/skill_buff.asset index e1d275bd5..93055d5ba 100644 --- a/Assets/arts/atlas/icon/skill_buff.asset +++ b/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 diff --git a/Assets/arts/atlas/icon/skill_buff.spriteatlas b/Assets/arts/atlas/icon/skill_buff.spriteatlas index 4b7ea61b6..5c361b1db 100644 --- a/Assets/arts/atlas/icon/skill_buff.spriteatlas +++ b/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 diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index dac1ba6ee..1ef835330 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/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 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index 5672078bf..55f0878a7 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/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 diff --git a/Assets/arts/textures/icon/skill_buff/frame_1.png b/Assets/arts/textures/icon/skill_buff/frame_1.png deleted file mode 100644 index 872873172bc3e3069c826fe853f72f13d3f8f55d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1942 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 delta 1908 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 Oeq|4HvZh$xPWcaeMx&ho delta 1916 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 MC_gl^9dRb>Ut+eThX4Qo literal 0 HcmV?d00001 diff --git a/Assets/arts/textures/icon/skill_buff/frame_1.png.meta b/Assets/arts/textures/icon/skill_buff/frame_4.png.meta similarity index 98% rename from Assets/arts/textures/icon/skill_buff/frame_1.png.meta rename to Assets/arts/textures/icon/skill_buff/frame_4.png.meta index afec31468..cbaa8b5d0 100644 --- a/Assets/arts/textures/icon/skill_buff/frame_1.png.meta +++ b/Assets/arts/textures/icon/skill_buff/frame_4.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58b5441136017ef418dcb148b831feed +guid: 688f3dc14b978ce418a6d77e807e22f3 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/arts/textures/ui/battle/battle_skill_purple_1.png b/Assets/arts/textures/ui/battle/battle_skill_bg_purple_1.png similarity index 100% rename from Assets/arts/textures/ui/battle/battle_skill_purple_1.png rename to Assets/arts/textures/ui/battle/battle_skill_bg_purple_1.png diff --git a/Assets/arts/textures/ui/battle/battle_skill_purple_1.png.meta b/Assets/arts/textures/ui/battle/battle_skill_bg_purple_1.png.meta similarity index 98% rename from Assets/arts/textures/ui/battle/battle_skill_purple_1.png.meta rename to Assets/arts/textures/ui/battle/battle_skill_bg_purple_1.png.meta index fad10f9c3..7102fde2d 100644 --- a/Assets/arts/textures/ui/battle/battle_skill_purple_1.png.meta +++ b/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: {} diff --git a/Assets/arts/textures/ui/battle/battle_skill_purple_2.png b/Assets/arts/textures/ui/battle/battle_skill_bg_purple_2.png similarity index 100% rename from Assets/arts/textures/ui/battle/battle_skill_purple_2.png rename to Assets/arts/textures/ui/battle/battle_skill_bg_purple_2.png diff --git a/Assets/arts/textures/ui/battle/battle_skill_purple_2.png.meta b/Assets/arts/textures/ui/battle/battle_skill_bg_purple_2.png.meta similarity index 98% rename from Assets/arts/textures/ui/battle/battle_skill_purple_2.png.meta rename to Assets/arts/textures/ui/battle/battle_skill_bg_purple_2.png.meta index 53d7ca459..7a5e9190c 100644 --- a/Assets/arts/textures/ui/battle/battle_skill_purple_2.png.meta +++ b/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: {} diff --git a/Assets/prefabs/ui/battle/cell/skill_select_cell.prefab b/Assets/prefabs/ui/battle/cell/skill_select_cell.prefab index 61552c66b..8d95424fc 100644 --- a/Assets/prefabs/ui/battle/cell/skill_select_cell.prefab +++ b/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: 1945404522398777861} + - component: {fileID: 2774013824427998309} + - 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} diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index 11a0a35e5..489d62bed 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/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_RootOrder: 13 + m_Father: {fileID: 3423933033153386276} + 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