Browse Source

职业转职信息界面

zhenglijun 3 ngày trước cách đây
mục cha
commit
e3f71f9548
22 tập tin đã thay đổi với 385 bổ sung366 xóa
  1. 1 2
      Assets/AssetConfigs/Addressable/CustomSearch.txt
  2. BIN
      Assets/Res/Addressable/FGUI/Player/Player_atlas0.png
  3. BIN
      Assets/Res/Addressable/FGUI/Player/Player_fui.bytes
  4. 3 172
      Assets/Res/Addressable/UI/Atlas/ItemIcon/atlas_rauai_itemicon.spriteatlas
  5. 3 139
      Assets/Res/Addressable/UI/Atlas/Partner/atlas_rauap_partner.spriteatlas
  6. 3 13
      Assets/Res/Addressable/UI/Atlas/SkillIcon/atlas_rauas_skillicon.spriteatlas
  7. 118 6
      Assets/Scripts/Business/Runtime/FGUI/Player/JobInformationPanel/PlayerJobInformationPanelCtrl.cs
  8. 10 5
      Assets/Scripts/Business/Runtime/FGUI/Player/JobInformationPanel/PlayerJobInformationPanelVM.Gen.cs
  9. 10 12
      Assets/Scripts/Business/Runtime/FGUI/Player/JokSkillNested/PlayerJokSkillNestedCtrl.cs
  10. 3 10
      Assets/Scripts/Business/Runtime/FGUI/Player/JokSkillNested/PlayerJokSkillNestedVM.Gen.cs
  11. 18 1
      Assets/Scripts/Business/Runtime/FGUI/Player/PassiveSkillIconListItem/PlayerPassiveSkillIconListItemCtrl.cs
  12. 2 2
      Assets/Scripts/Business/Runtime/FGUI/Player/PassiveSkillIconListItem/PlayerPassiveSkillIconListItemVM.Gen.cs
  13. 2 3
      Assets/Scripts/Business/Runtime/FGUI/Player/PassiveSkillIconListItem/PlayerPassiveSkillIconListItemView.ListItem.cs
  14. 8 0
      Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested.meta
  15. 75 0
      Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedCtrl.cs
  16. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedCtrl.cs.meta
  17. 39 0
      Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedVM.Gen.cs
  18. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedVM.Gen.cs.meta
  19. 23 0
      Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedView.cs
  20. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedView.cs.meta
  21. 30 1
      Assets/Scripts/Business/Runtime/FGUI/Player/TransferSucessPanel/PlayerTransferSucessPanelCtrl.cs
  22. 4 0
      Assets/Scripts/Business/Runtime/FGUI/Player/TransferSucessPanel/PlayerTransferSucessPanelVM.Gen.cs

+ 1 - 2
Assets/AssetConfigs/Addressable/CustomSearch.txt

@@ -1,4 +1,4 @@
-400
+399
 Assets/Res/Addressable/Tables/achieveRewardTable.bytes
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0.TTF
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0 SDF.asset
@@ -230,7 +230,6 @@ Assets/Res/Addressable/UI/Atlas/Icons/icon9.png
 Assets/Res/Addressable/Playable/info_job_1001_1_SkeletonData.asset
 Assets/Res/Addressable/Tables/infoTable.bytes
 Assets/Res/Addressable/FGUI/Item/Item_atlas0.png
-Assets/Res/Addressable/FGUI/Item/Item_atlas_tli0l.png
 Assets/Res/Addressable/FGUI/Item/Item_fui.bytes
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1001.png

BIN
Assets/Res/Addressable/FGUI/Player/Player_atlas0.png


BIN
Assets/Res/Addressable/FGUI/Player/Player_fui.bytes


+ 3 - 172
Assets/Res/Addressable/UI/Atlas/ItemIcon/atlas_rauai_itemicon.spriteatlas

@@ -80,181 +80,12 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 961c6c60efa6c4f4ca250f0ddec2adc7: 21300000
-    - 59a71c704d4fb2f489743af33d231438: 21300000
-    - b869eff043911bd4a97b23a3cbf93635: 21300000
-    - 17434301afa05174f842e58076d75e01: 21300000
-    - 16e44b7144944ec48bc6e67ddaa3a552: 21300000
-    - 9ecf0ac151c4eb144afb54c16e8237d6: 21300000
-    - 26450dc1f7c2ecc4ab43e3944fb9c18f: 21300000
-    - a153fe422f616534caa640a7fb19551e: 21300000
-    - 7025ac521e6e9fd47b204c5eb43b46f7: 21300000
-    - 6a688d62e7000a44f94fa46c20419b08: 21300000
-    - c54ad1b2f48e38e4da939c3b2e9753e5: 21300000
-    - adda6e23389223d4c92afb7f654b17db: 21300000
-    - 0455c343f3420f841bb6c8bd665cd4b7: 21300000
-    - 03eb3483d8d1e87419a763ad09e7c945: 21300000
-    - f81f13a3e0317c74d8a6609a69e38e64: 21300000
-    - a8e872e3264e6674f95f2475419d6993: 21300000
-    - 984cff14e5800ca40859c5ab01d4eba2: 21300000
-    - 951e0a541f216534eaab0b58fab910fe: 21300000
-    - 1a504064c320a4f44a850941900f134f: 21300000
-    - 4097330583a64b943954f3d997e6d9b2: 21300000
-    - 7d1f5a957a416bf42bf130c249417a2b: 21300000
-    - 6e732db5cda607f47bd6106b4b639e40: 21300000
-    - 3f29f3363cc0f6440890902b14a5dc87: 21300000
-    - db93d8c6f016e5243876b0a9996aadd0: 21300000
-    - 4f5aa36701116f440a2203031dedb845: 21300000
-    - bbd6d487feb947042afed91d819b68f5: 21300000
-    - 269de1c724d6e324b94d9c5e0692d779: 21300000
-    - 3e2a29485d627d446b181bb711b5f62a: 21300000
-    - fd8e27b8e5b02b045a8a168d6a6b0778: 21300000
-    - c2ccc1c8caf5a624097c5b62d204482b: 21300000
-    - d1f61ec81a746684381bb3d57663a52d: 21300000
-    - 2ce265d865bf35b42a7f2d1bffdd6fad: 21300000
-    - d8f36a19c251fea43963fe3b114269c5: 21300000
-    - 2ded1f596c6ba9b44b95fc814be28291: 21300000
-    - bda8bb69083a143459dc8bb174985fe4: 21300000
-    - f80c34b9b43e15741a732ecc408ccbfc: 21300000
-    - 91d9352ab0bb95645ae90df10172d0ec: 21300000
-    - 793c3e5ad07665645afe7d4015f71f5d: 21300000
-    - d887147a341034a40a7e02adaedc7430: 21300000
-    - 71d40baaf86b80347bd16fc9e04ffb02: 21300000
-    - ce3973fad12c3f14ba586dc1dc50775c: 21300000
-    - 02ebae1b1da4c134793c3d92ed0b39e7: 21300000
-    - 8da8d62b10fd2254ba85cb0622c5ed90: 21300000
-    - d1bb084ba3f78e742bc9781278c5d00e: 21300000
-    - 68d7d59b0002f7146a81241d44d81e7a: 21300000
-    - 34c5ceeb3f0eb2f4bbfeefbd9b1a9345: 21300000
-    - 3a9f801cbeafc9d4385dc9938422d2af: 21300000
-    - bca7503cf07c44043aa40ea5a2e4acd5: 21300000
-    - f665c1fc0f2ad624988185cc62ef3551: 21300000
-    - 0fa12ffc200c7f64fb4d350e873a41dd: 21300000
-    - 4f5c427d96599a447a7363f14044a8a0: 21300000
-    - 400743ddbbab5cb40a1534a491e3e96d: 21300000
-    - 6665f3ed45e2ed548b5a06b86b85398d: 21300000
-    - 45f4b0ae2448f9744baee018dc21583d: 21300000
-    - ce26833f5cc3e1948ac8475b2566efc1: 21300000
-    - d594797f58341904d9dbe2056c95ba03: 21300000
-    - 8bba91af604f8b045ba1dad87aaed685: 21300000
+    packedSpriteRenderDataKeys: []
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 961c6c60efa6c4f4ca250f0ddec2adc7, type: 3}
-  - {fileID: 21300000, guid: 59a71c704d4fb2f489743af33d231438, type: 3}
-  - {fileID: 21300000, guid: b869eff043911bd4a97b23a3cbf93635, type: 3}
-  - {fileID: 21300000, guid: 17434301afa05174f842e58076d75e01, type: 3}
-  - {fileID: 21300000, guid: 16e44b7144944ec48bc6e67ddaa3a552, type: 3}
-  - {fileID: 21300000, guid: 9ecf0ac151c4eb144afb54c16e8237d6, type: 3}
-  - {fileID: 21300000, guid: 26450dc1f7c2ecc4ab43e3944fb9c18f, type: 3}
-  - {fileID: 21300000, guid: a153fe422f616534caa640a7fb19551e, type: 3}
-  - {fileID: 21300000, guid: 7025ac521e6e9fd47b204c5eb43b46f7, type: 3}
-  - {fileID: 21300000, guid: 6a688d62e7000a44f94fa46c20419b08, type: 3}
-  - {fileID: 21300000, guid: c54ad1b2f48e38e4da939c3b2e9753e5, type: 3}
-  - {fileID: 21300000, guid: adda6e23389223d4c92afb7f654b17db, type: 3}
-  - {fileID: 21300000, guid: 0455c343f3420f841bb6c8bd665cd4b7, type: 3}
-  - {fileID: 21300000, guid: 03eb3483d8d1e87419a763ad09e7c945, type: 3}
-  - {fileID: 21300000, guid: f81f13a3e0317c74d8a6609a69e38e64, type: 3}
-  - {fileID: 21300000, guid: a8e872e3264e6674f95f2475419d6993, type: 3}
-  - {fileID: 21300000, guid: 984cff14e5800ca40859c5ab01d4eba2, type: 3}
-  - {fileID: 21300000, guid: 951e0a541f216534eaab0b58fab910fe, type: 3}
-  - {fileID: 21300000, guid: 1a504064c320a4f44a850941900f134f, type: 3}
-  - {fileID: 21300000, guid: 4097330583a64b943954f3d997e6d9b2, type: 3}
-  - {fileID: 21300000, guid: 7d1f5a957a416bf42bf130c249417a2b, type: 3}
-  - {fileID: 21300000, guid: 6e732db5cda607f47bd6106b4b639e40, type: 3}
-  - {fileID: 21300000, guid: 3f29f3363cc0f6440890902b14a5dc87, type: 3}
-  - {fileID: 21300000, guid: db93d8c6f016e5243876b0a9996aadd0, type: 3}
-  - {fileID: 21300000, guid: 4f5aa36701116f440a2203031dedb845, type: 3}
-  - {fileID: 21300000, guid: bbd6d487feb947042afed91d819b68f5, type: 3}
-  - {fileID: 21300000, guid: 269de1c724d6e324b94d9c5e0692d779, type: 3}
-  - {fileID: 21300000, guid: 3e2a29485d627d446b181bb711b5f62a, type: 3}
-  - {fileID: 21300000, guid: fd8e27b8e5b02b045a8a168d6a6b0778, type: 3}
-  - {fileID: 21300000, guid: c2ccc1c8caf5a624097c5b62d204482b, type: 3}
-  - {fileID: 21300000, guid: d1f61ec81a746684381bb3d57663a52d, type: 3}
-  - {fileID: 21300000, guid: 2ce265d865bf35b42a7f2d1bffdd6fad, type: 3}
-  - {fileID: 21300000, guid: d8f36a19c251fea43963fe3b114269c5, type: 3}
-  - {fileID: 21300000, guid: 2ded1f596c6ba9b44b95fc814be28291, type: 3}
-  - {fileID: 21300000, guid: bda8bb69083a143459dc8bb174985fe4, type: 3}
-  - {fileID: 21300000, guid: f80c34b9b43e15741a732ecc408ccbfc, type: 3}
-  - {fileID: 21300000, guid: 91d9352ab0bb95645ae90df10172d0ec, type: 3}
-  - {fileID: 21300000, guid: 793c3e5ad07665645afe7d4015f71f5d, type: 3}
-  - {fileID: 21300000, guid: d887147a341034a40a7e02adaedc7430, type: 3}
-  - {fileID: 21300000, guid: 71d40baaf86b80347bd16fc9e04ffb02, type: 3}
-  - {fileID: 21300000, guid: ce3973fad12c3f14ba586dc1dc50775c, type: 3}
-  - {fileID: 21300000, guid: 02ebae1b1da4c134793c3d92ed0b39e7, type: 3}
-  - {fileID: 21300000, guid: 8da8d62b10fd2254ba85cb0622c5ed90, type: 3}
-  - {fileID: 21300000, guid: d1bb084ba3f78e742bc9781278c5d00e, type: 3}
-  - {fileID: 21300000, guid: 68d7d59b0002f7146a81241d44d81e7a, type: 3}
-  - {fileID: 21300000, guid: 34c5ceeb3f0eb2f4bbfeefbd9b1a9345, type: 3}
-  - {fileID: 21300000, guid: 3a9f801cbeafc9d4385dc9938422d2af, type: 3}
-  - {fileID: 21300000, guid: bca7503cf07c44043aa40ea5a2e4acd5, type: 3}
-  - {fileID: 21300000, guid: f665c1fc0f2ad624988185cc62ef3551, type: 3}
-  - {fileID: 21300000, guid: 0fa12ffc200c7f64fb4d350e873a41dd, type: 3}
-  - {fileID: 21300000, guid: 4f5c427d96599a447a7363f14044a8a0, type: 3}
-  - {fileID: 21300000, guid: 400743ddbbab5cb40a1534a491e3e96d, type: 3}
-  - {fileID: 21300000, guid: 6665f3ed45e2ed548b5a06b86b85398d, type: 3}
-  - {fileID: 21300000, guid: 45f4b0ae2448f9744baee018dc21583d, type: 3}
-  - {fileID: 21300000, guid: ce26833f5cc3e1948ac8475b2566efc1, type: 3}
-  - {fileID: 21300000, guid: d594797f58341904d9dbe2056c95ba03, type: 3}
-  - {fileID: 21300000, guid: 8bba91af604f8b045ba1dad87aaed685, type: 3}
+  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
   m_PackedSpriteNamesToIndex:
-  - ItemIcon_610201
-  - ItemIcon_210601
-  - daojukuang5
-  - daojukuang7
-  - ItemIcon_510501
-  - ItemIcon_110601
-  - daojukuang6
-  - ItemIcon_110401
-  - ItemIcon_4
-  - ItemIcon_110501
-  - ItemIcon_610601
-  - ItemIcon_6
-  - daojukuang1
-  - ItemIcon_310601
-  - ItemIcon_410601
-  - ItemIcon_610501
-  - ItemIcon_410201
-  - ItemIcon_510201
-  - daojukuang10
-  - ItemIcon_210201
-  - daojukuang11
-  - ItemIcon_510601
-  - ItemIcon_310301
-  - ItemIcon_210101
-  - ItemIcon_2
-  - ItemIcon_410301
-  - ItemIcon_3001
-  - ItemIcon_110201
-  - ItemIcon_410401
-  - ItemIcon_210501
-  - ItemIcon_610301
-  - ItemIcon_610401
-  - ItemIcon_110101
-  - ItemIcon_210301
-  - ItemIcon_110301
-  - ItemIcon_310401
-  - daojukuang3
-  - ItemIcon_310201
-  - daojukuang4
-  - ItemIcon_1
-  - ItemIcon_410101
-  - ItemIcon_1024
-  - ItemIcon_210401
-  - ItemIcon_99
-  - ItemIcon_310501
-  - ItemIcon_610101
-  - ItemIcon_510301
-  - ItemIcon_1001
-  - ItemIcon_5
-  - ItemIcon_510101
-  - daojukuang9
-  - daojukuang2
-  - ItemIcon_3
-  - ItemIcon_510401
-  - daojukuang8
-  - ItemIcon_310101
-  - ItemIcon_410501
+  - vcard_img_mingpian_exhbition_bg
   m_RenderDataMap: {}
   m_Tag: atlas_rauai_itemicon
   m_IsVariant: 0

+ 3 - 139
Assets/Res/Addressable/UI/Atlas/Partner/atlas_rauap_partner.spriteatlas

@@ -80,148 +80,12 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 4e1ed421d3509a2448f2f0fd353fe061: 21300000
-    - be3fca415234a1b4685d1a2573270753: 21300000
-    - fecfa332fbc09b24b98f32c9cc9d421f: 21300000
-    - c6e35a6229056dc4a9a6acd3fc176317: 21300000
-    - 0331f8c29a15a924bbd40992f1db02b0: 21300000
-    - af513c93eea18c542a538ae31fc742cd: 21300000
-    - d75c40140ef5f4847ba7a3d9c3b60fe4: 21300000
-    - d080aa44dd5497c4e8722a9c7ed88ae2: 21300000
-    - 28e24b65f0c900f47a665b7d05526906: 21300000
-    - d997cfb5985a42e479ee01f698a55f12: 21300000
-    - 24c4f816025819e4f8d8974f9e98d68d: 21300000
-    - 78a95d26e838c2442a9af4d91cf20d4b: 21300000
-    - a489756687ac9bb43a47e99d168c5b81: 21300000
-    - 131aabb6441e4954b9183a33e4f3ca8e: 21300000
-    - b30484c782024804280e6598747ed018: 21300000
-    - fd69ead73c6b3124ba67546bbc905594: 21300000
-    - 7e8140f7aafa5ec419b699bf57646c46: 21300000
-    - e7e190f78351d134eaf1408c6eafbe3d: 21300000
-    - 431106185aba18046bee6c24c895b739: 21300000
-    - 0df56f58b15e3074194c5a96db6c4181: 21300000
-    - 1bcaefa8c04acd7419776b6915412804: 21300000
-    - 103cf5198ffe9434f992c85ec0cdb4f7: 21300000
-    - 1cb0b1298af1d0744ad588c352493fdf: 21300000
-    - 92394c1a1208af644bee54d7e9f73cf3: 21300000
-    - 1303926a12f069640827f2bdcbc0c7c6: 21300000
-    - 30af1a7abe853734d9eb3e2b062628e6: 21300000
-    - 5d1103fa526d54446984e1d8b20d2e8a: 21300000
-    - 626d912bd1d82704da6f14e1a7d36e71: 21300000
-    - a4f3689b37972234496dd91d79bafdf4: 21300000
-    - 6bc668abf6357a74ca311513ffb36953: 21300000
-    - 838fb90c0e02d454a8442aacba8414e5: 21300000
-    - 30ae4c1c6aad83b4194879ae4e53cffe: 21300000
-    - 820b2ccc16e5fe84bae23af243bfcb60: 21300000
-    - 94fc971df928d6e478bca59d7a236a29: 21300000
-    - 794f7f2d026e2504c8d940726259c269: 21300000
-    - ff78e35de8728a5428e5850a13622edb: 21300000
-    - 46b2b97d5fda8b244a944a99729f4c46: 21300000
-    - 5cc42dadf49af514fbcc4e4003a65f26: 21300000
-    - b9e79cbef0c6aea4ab680a44ac30e9cc: 21300000
-    - 4f3ffcbe3f7219a44a790bae47163632: 21300000
-    - a0e52fce8a7a08b4ab0011094188c4b8: 21300000
-    - 34ca522fe11e9124eb3e4c75c372ca91: 21300000
-    - b2b9d27f5f31d8141a86896d551c74ec: 21300000
-    - 8e34167fe65877e4299bc86699a11872: 21300000
-    - ed7e619f930a86e4f96668b995953164: 21300000
-    - 4262cecf5fa2e874997471733abc1420: 21300000
+    packedSpriteRenderDataKeys: []
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 4e1ed421d3509a2448f2f0fd353fe061, type: 3}
-  - {fileID: 21300000, guid: be3fca415234a1b4685d1a2573270753, type: 3}
-  - {fileID: 21300000, guid: fecfa332fbc09b24b98f32c9cc9d421f, type: 3}
-  - {fileID: 21300000, guid: c6e35a6229056dc4a9a6acd3fc176317, type: 3}
-  - {fileID: 21300000, guid: 0331f8c29a15a924bbd40992f1db02b0, type: 3}
-  - {fileID: 21300000, guid: af513c93eea18c542a538ae31fc742cd, type: 3}
-  - {fileID: 21300000, guid: d75c40140ef5f4847ba7a3d9c3b60fe4, type: 3}
-  - {fileID: 21300000, guid: d080aa44dd5497c4e8722a9c7ed88ae2, type: 3}
-  - {fileID: 21300000, guid: 28e24b65f0c900f47a665b7d05526906, type: 3}
-  - {fileID: 21300000, guid: d997cfb5985a42e479ee01f698a55f12, type: 3}
-  - {fileID: 21300000, guid: 24c4f816025819e4f8d8974f9e98d68d, type: 3}
-  - {fileID: 21300000, guid: 78a95d26e838c2442a9af4d91cf20d4b, type: 3}
-  - {fileID: 21300000, guid: a489756687ac9bb43a47e99d168c5b81, type: 3}
-  - {fileID: 21300000, guid: 131aabb6441e4954b9183a33e4f3ca8e, type: 3}
-  - {fileID: 21300000, guid: b30484c782024804280e6598747ed018, type: 3}
-  - {fileID: 21300000, guid: fd69ead73c6b3124ba67546bbc905594, type: 3}
-  - {fileID: 21300000, guid: 7e8140f7aafa5ec419b699bf57646c46, type: 3}
-  - {fileID: 21300000, guid: e7e190f78351d134eaf1408c6eafbe3d, type: 3}
-  - {fileID: 21300000, guid: 431106185aba18046bee6c24c895b739, type: 3}
-  - {fileID: 21300000, guid: 0df56f58b15e3074194c5a96db6c4181, type: 3}
-  - {fileID: 21300000, guid: 1bcaefa8c04acd7419776b6915412804, type: 3}
-  - {fileID: 21300000, guid: 103cf5198ffe9434f992c85ec0cdb4f7, type: 3}
-  - {fileID: 21300000, guid: 1cb0b1298af1d0744ad588c352493fdf, type: 3}
-  - {fileID: 21300000, guid: 92394c1a1208af644bee54d7e9f73cf3, type: 3}
-  - {fileID: 21300000, guid: 1303926a12f069640827f2bdcbc0c7c6, type: 3}
-  - {fileID: 21300000, guid: 30af1a7abe853734d9eb3e2b062628e6, type: 3}
-  - {fileID: 21300000, guid: 5d1103fa526d54446984e1d8b20d2e8a, type: 3}
-  - {fileID: 21300000, guid: 626d912bd1d82704da6f14e1a7d36e71, type: 3}
-  - {fileID: 21300000, guid: a4f3689b37972234496dd91d79bafdf4, type: 3}
-  - {fileID: 21300000, guid: 6bc668abf6357a74ca311513ffb36953, type: 3}
-  - {fileID: 21300000, guid: 838fb90c0e02d454a8442aacba8414e5, type: 3}
-  - {fileID: 21300000, guid: 30ae4c1c6aad83b4194879ae4e53cffe, type: 3}
-  - {fileID: 21300000, guid: 820b2ccc16e5fe84bae23af243bfcb60, type: 3}
-  - {fileID: 21300000, guid: 94fc971df928d6e478bca59d7a236a29, type: 3}
-  - {fileID: 21300000, guid: 794f7f2d026e2504c8d940726259c269, type: 3}
-  - {fileID: 21300000, guid: ff78e35de8728a5428e5850a13622edb, type: 3}
-  - {fileID: 21300000, guid: 46b2b97d5fda8b244a944a99729f4c46, type: 3}
-  - {fileID: 21300000, guid: 5cc42dadf49af514fbcc4e4003a65f26, type: 3}
-  - {fileID: 21300000, guid: b9e79cbef0c6aea4ab680a44ac30e9cc, type: 3}
-  - {fileID: 21300000, guid: 4f3ffcbe3f7219a44a790bae47163632, type: 3}
-  - {fileID: 21300000, guid: a0e52fce8a7a08b4ab0011094188c4b8, type: 3}
-  - {fileID: 21300000, guid: 34ca522fe11e9124eb3e4c75c372ca91, type: 3}
-  - {fileID: 21300000, guid: b2b9d27f5f31d8141a86896d551c74ec, type: 3}
-  - {fileID: 21300000, guid: 8e34167fe65877e4299bc86699a11872, type: 3}
-  - {fileID: 21300000, guid: ed7e619f930a86e4f96668b995953164, type: 3}
-  - {fileID: 21300000, guid: 4262cecf5fa2e874997471733abc1420, type: 3}
+  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
   m_PackedSpriteNamesToIndex:
-  - partner_pzdi_5
-  - epigraph_pzempty_7
-  - epigraph_pzempty_5
-  - partner_elementType_3
-  - partner_pzdi_2
-  - partner_elementType_2
-  - partner_pzdi_8
-  - epigraph_pzempty_2
-  - epigraph_mwpz_8
-  - partner_jindutiao_7
-  - epigraph_mwpz_1
-  - epigraph_mwpz_7
-  - epigraph_pztype_4
-  - partner_jindutiao_5
-  - epigraph_pztype_3
-  - epigraph_mwpz_6
-  - epigraph_pztype_6
-  - epigraph_pzempty_8
-  - epigraph_mwpz_2
-  - epigraph_pztype_8
-  - partner_emptydi
-  - partner_jindutiao_2
-  - epigraph_pztype_5
-  - partner_jindutiao_1
-  - partner_pzdi_1
-  - epigraph_pztype_2
-  - epigraph_mwpz_4
-  - partner_jindutiao_4
-  - epigraph_pztype_1
-  - partner_pzdi_4
-  - epigraph_mwpz_3
-  - partner_pzdi_7
-  - partner_pzdi_6
-  - epigraph_pzempty_1
-  - epigraph_mwpz_5
-  - epigraph_pzempty_3
-  - partner_jindutiao_3
-  - partner_elementType_5
-  - epigraph_pztype_7
-  - epigraph_pzempty_4
-  - partner_jindutiao_8
-  - partner_elementType_1
-  - partner_elementType_4
-  - epigraph_pzempty_6
-  - partner_pzdi_3
-  - partner_jindutiao_6
+  - vcard_img_mingpian_exhbition_bg
   m_RenderDataMap: {}
   m_Tag: atlas_rauap_partner
   m_IsVariant: 0

+ 3 - 13
Assets/Res/Addressable/UI/Atlas/SkillIcon/atlas_rauas_skillicon.spriteatlas

@@ -80,22 +80,12 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 86bb72a2ce0056b49ac28e4a0904043f: 21300000
-    - 14c6a7a260d3b464ea5fe787559c5849: 21300000
-    - a8ebcff948302dc40a6796275173488c: 21300000
-    - 7e7a15eb5df23304c9f17d61c7c95cb3: 21300000
+    packedSpriteRenderDataKeys: []
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 86bb72a2ce0056b49ac28e4a0904043f, type: 3}
-  - {fileID: 21300000, guid: 14c6a7a260d3b464ea5fe787559c5849, type: 3}
-  - {fileID: 21300000, guid: a8ebcff948302dc40a6796275173488c, type: 3}
-  - {fileID: 21300000, guid: 7e7a15eb5df23304c9f17d61c7c95cb3, type: 3}
+  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
   m_PackedSpriteNamesToIndex:
-  - SkillIcon_20521101
-  - SkillIcon_200701
-  - SkillIcon_201711
-  - SkillIcon_13521
+  - vcard_img_mingpian_exhbition_bg
   m_RenderDataMap: {}
   m_Tag: atlas_rauas_skillicon
   m_IsVariant: 0

+ 118 - 6
Assets/Scripts/Business/Runtime/FGUI/Player/JobInformationPanel/PlayerJobInformationPanelCtrl.cs

@@ -1,10 +1,13 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
 /// created by cb 2024
 
 using FairyGUI;
+using FL.Data;
+using System.Collections.Generic;
+using XGame.Database;
 using XGame.Framework.UI;
 
 namespace FL.FGUI
@@ -15,34 +18,143 @@ namespace FL.FGUI
     /// <typeparam name=""></typeparam>
     public partial class PlayerJobInformationPanelCtrl : UIController<PlayerJobInformationPanelVM>
     {
+        private int[] _posX;
+        private List<JobSkillParam> _passiveSkillDataArray;
+
         protected override void OnEnable(object intent)
         {
             AddUIListenres();
+            InitUI();
+            ShowUI();
         }
         protected override void OnDisable()
         {
             RemoveUIListenres();
+            _passiveSkillDataArray?.Clear();
+            _passiveSkillDataArray = null;
+            if (_posX != null) _posX = null;
         }
         #region UI事件
         private void AddUIListenres()
         {
-            VM.SkillIconBtn.onClick.Add(OnClickSkillIconBtn);
             VM.BackBtn.onClick.Add(OnClickBackBtn);
-
+            VM.HideSkillInfoGroupBtn.onClick.Add(OnClickHideSkillInfoGroupBtn);
+            VM.PassiveSkillList.ItemClickEvent += OnClickPassiveSkillItem;
         }
         private void RemoveUIListenres()
         {
-            VM.SkillIconBtn.onClick.Remove(OnClickSkillIconBtn);
             VM.BackBtn.onClick.Remove(OnClickBackBtn);
-
+            VM.HideSkillInfoGroupBtn.onClick.Remove(OnClickHideSkillInfoGroupBtn);
+            VM.PassiveSkillList.ItemClickEvent -= OnClickPassiveSkillItem;
         }
-        private void OnClickSkillIconBtn(EventContext context)
+        /// <summary>
+        /// 隐藏技能信息提示框
+        /// </summary>
+        /// <param name="context"></param>
+        private void OnClickHideSkillInfoGroupBtn(EventContext context)
         {
+            ShowSkillInfoGroup(false);
         }
+ 
         private void OnClickBackBtn(EventContext context)
         {
+            Context.ClosePanel();
         }
 
         #endregion
+
+        private void InitUI()
+        {
+            ShowSkillInfoGroup(false);
+            if (_posX == null) _posX = new int[5] { 78, 192, 36, 145, 255 };
+        }
+
+        private void ShowUI()
+        {
+            var jobInfo = careerTableRepo.Get(PlayerData.Instance.JobId);
+            if (jobInfo == null) return;
+
+            VM.JobNameLabel.text = jobInfo.Name;
+            VM.JobTypeLabel.text = jobInfo.Job_pos;
+            VM.JobDescLabel.text = jobInfo.Desc;
+            ShowSkill(jobInfo.Skill);
+            ShowJobPassiveSkillUI(jobInfo.Passive_skill);
+            LoadJobSpine("info_job_1001_1_SkeletonData");
+        }
+
+        /// <summary>
+        /// 主动技能
+        /// </summary>
+        /// <param name="skillIds"></param>
+
+        private void ShowSkill(int[] skillIds)
+        {
+            var skillInfo = SkillTableRepo.Get(skillIds[1]);
+            if (skillInfo == null) return;
+            VM.SkillNameLabel.text = skillInfo.Name;
+            VM.SkillDescLabel.text = skillInfo.Desc;
+            VM.ActiveSkillIcon.icon = skillInfo.Icon;
+            VM.SkillCdLabel.text = (skillInfo.RestTime * 0.001f).ToString("F1"); 
+        }
+
+        /// <summary>
+        /// 职业被动技能UI
+        /// </summary>
+        private void ShowJobPassiveSkillUI(int[] skillIds)
+        {
+            int index = 0;
+            if (_passiveSkillDataArray == null) _passiveSkillDataArray = new List<JobSkillParam>();
+            for (int i = 0; i < skillIds.Length; i += 2)
+            {
+                _passiveSkillDataArray.Add(new JobSkillParam()
+                {
+                    unlockLv = skillIds[i],
+                    skillId = skillIds[i + 1],
+                });
+                index++;
+            }
+            VM.PassiveSkillList.BindDatas(_passiveSkillDataArray);
+        }
+
+        /// <summary>
+        /// 点击的被动技能项
+        /// </summary>
+        /// <param name="index"></param>
+        private void OnClickPassiveSkillItem(int index)
+        {
+            XGame.Log.Warn($"点击的被动技能id:{_passiveSkillDataArray[index].skillId}");
+            ShowSkillInfoGroup(true, index, SkillTableRepo.Get(_passiveSkillDataArray[index].skillId));
+        }
+
+        /// <summary>
+        /// 显示技能弹窗信息UI
+        /// </summary>
+        /// <param name="Show"></param>
+        /// <param name="bPassive"></param>
+        private void ShowSkillInfoGroup(bool bShow, int index = 0, SkillTable skillInfo = null)
+        {
+            VM.HideSkillInfoGroupBtn.visible = bShow;
+            if (bShow && skillInfo != null)
+            {
+                VM.SkillInfoNested.Enable(new SkillInfoParam() { bShowRightBubble = index > 1, skillInfo = skillInfo });
+                var pos = VM.SkillInfoNested.VM.Tr.localPosition;
+                pos.x = _posX[index];
+                VM.SkillInfoNested.VM.Tr.localPosition = pos;
+            }
+            else
+            {
+                VM.SkillInfoNested.Disable();
+            }
+        }
+
+
+        /// <summary>
+        /// 加载主角的spine
+        /// </summary>
+        /// <param name="spineName"></param>
+        private void LoadJobSpine(string spineName)
+        {
+            VM.JobSpine.LoadSpine(spineName, "stand", true);
+        }
     }
 }

+ 10 - 5
Assets/Scripts/Business/Runtime/FGUI/Player/JobInformationPanel/PlayerJobInformationPanelVM.Gen.cs

@@ -19,29 +19,34 @@ namespace FL.FGUI
     public partial class PlayerJobInformationPanelVM : FguiViewModel
     {
         public GLoader3D JobSpine { get; private set; }
-        public GButton SkillIconBtn { get; private set; }
-        public GList PassiveSkillList { get; private set; }
         public GTextField JobNameLabel { get; private set; }
         public GTextField JobTypeLabel { get; private set; }
+        public GLoader ActiveSkillIcon { get; private set; }
+        public GList PassiveSkillList { get; private set; }
         public GTextField JobDescLabel { get; private set; }
         public GTextField SkillCdLabel { get; private set; }
         public GTextField SkillNameLabel { get; private set; }
         public GTextField SkillDescLabel { get; private set; }
+        public PlayerSkillInfoNestedView SkillInfoNested { get; private set; }
         public GButton BackBtn { get; private set; }
+        public GButton HideSkillInfoGroupBtn { get; private set; }
 
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
         {
             JobSpine = panel.GetChild("JobSpine") as GLoader3D;
-            SkillIconBtn = panel.GetChild("SkillIconBtn") as GButton;
-            PassiveSkillList = panel.GetChild("PassiveSkillList") as GList;
-            PassiveSkillList.Init(typeof(PlayerPassiveSkillIconListItemView), adapter.CreateListItem);
             JobNameLabel = panel.GetChild("JobNameLabel") as GTextField;
             JobTypeLabel = panel.GetChild("JobTypeLabel") as GTextField;
+            ActiveSkillIcon = panel.GetChild("ActiveSkillIcon") as GLoader;
+            PassiveSkillList = panel.GetChild("PassiveSkillList") as GList;
+            PassiveSkillList.Init(typeof(PlayerPassiveSkillIconListItemView), adapter.CreateListItem);
             JobDescLabel = panel.GetChild("JobDescLabel") as GTextField;
             SkillCdLabel = panel.GetChild("SkillCdLabel") as GTextField;
             SkillNameLabel = panel.GetChild("SkillNameLabel") as GTextField;
             SkillDescLabel = panel.GetChild("SkillDescLabel") as GTextField;
+            SkillInfoNested = adapter.CreateNested<PlayerSkillInfoNestedView>(new FguiNested(panel.GetChild("SkillInfoNested").asCom), true);
+            AddChild(SkillInfoNested);
             BackBtn = panel.GetChild("BackBtn") as GButton;
+            HideSkillInfoGroupBtn = panel.GetChild("HideSkillInfoGroupBtn") as GButton;
 
         }
     }

+ 10 - 12
Assets/Scripts/Business/Runtime/FGUI/Player/JokSkillNested/PlayerJokSkillNestedCtrl.cs

@@ -246,8 +246,7 @@ namespace FL.FGUI
             var skillInfo = SkillTableRepo.Get(skillId);
             if (skillInfo == null) return;
 
-            VM.SkillInfoTipCtrl.selectedIndex = index == -1 ? 0 : (index + 1);
-            ShowSkillInfoGroup(true, skillInfo);
+            ShowSkillInfoGroup(true, index, skillInfo);
         }
 
         /// <summary>
@@ -255,19 +254,18 @@ namespace FL.FGUI
         /// </summary>
         /// <param name="Show"></param>
         /// <param name="bPassive"></param>
-        private void ShowSkillInfoGroup(bool bShow, SkillTable skillInfo = null)
+        private void ShowSkillInfoGroup(bool bShow, int index = 0, SkillTable skillInfo = null)
         {
-            VM.SkillInfoGroup.visible = bShow;
             VM.HideSkillInfoGroupBtn.visible = bShow;
-            if (bShow && skillInfo != null)
+            if (bShow && skillInfo != null) 
             {
-                VM.SkillIcon.icon = skillInfo.Icon;
-                VM.SkillNameLabel.text = skillInfo.Name;
-                VM.SkillDescLabel.text = skillInfo.Desc;
-                if (skillInfo.ModalityType == 1) // 主动技能
-                {
-                    VM.SkillCdLabel.text = (skillInfo.RestTime * 0.001f).ToString("F1");
-                }
+                VM.SkillInfoNested.Enable(new SkillInfoParam() { bShowRightBubble = index > 1, skillInfo=skillInfo });
+                VM.SkillInfoTipCtrl.selectedIndex = index == -1 ? 0 : (index + 1);
+                
+            }
+            else
+            {
+                VM.SkillInfoNested.Disable();
             }
         }
 

+ 3 - 10
Assets/Scripts/Business/Runtime/FGUI/Player/JokSkillNested/PlayerJokSkillNestedVM.Gen.cs

@@ -36,11 +36,7 @@ namespace FL.FGUI
         public GButton WakeUpBtn { get; private set; }
         public GButton TransferBtn { get; private set; }
         public GButton HideSkillInfoGroupBtn { get; private set; }
-        public GLoader SkillIcon { get; private set; }
-        public GTextField SkillNameLabel { get; private set; }
-        public GTextField SkillCdLabel { get; private set; }
-        public GTextField SkillDescLabel { get; private set; }
-        public GGroup SkillInfoGroup { get; private set; }
+        public PlayerSkillInfoNestedView SkillInfoNested { get; private set; }
 
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
         {
@@ -63,11 +59,8 @@ namespace FL.FGUI
             WakeUpBtn = panel.GetChild("WakeUpBtn") as GButton;
             TransferBtn = panel.GetChild("TransferBtn") as GButton;
             HideSkillInfoGroupBtn = panel.GetChild("HideSkillInfoGroupBtn") as GButton;
-            SkillIcon = panel.GetChild("SkillIcon") as GLoader;
-            SkillNameLabel = panel.GetChild("SkillNameLabel") as GTextField;
-            SkillCdLabel = panel.GetChild("SkillCdLabel") as GTextField;
-            SkillDescLabel = panel.GetChild("SkillDescLabel") as GTextField;
-            SkillInfoGroup = panel.GetChild("SkillInfoGroup") as GGroup;
+            SkillInfoNested = adapter.CreateNested<PlayerSkillInfoNestedView>(new FguiNested(panel.GetChild("SkillInfoNested").asCom), true);
+            AddChild(SkillInfoNested);
 
         }
     }

+ 18 - 1
Assets/Scripts/Business/Runtime/FGUI/Player/PassiveSkillIconListItem/PlayerPassiveSkillIconListItemCtrl.cs

@@ -1,10 +1,12 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
 /// created by cb 2024
 
 using FairyGUI;
+using System;
+using XGame.Database;
 using XGame.Framework.UI;
 
 namespace FL.FGUI
@@ -15,6 +17,9 @@ namespace FL.FGUI
     /// <typeparam name=""></typeparam>
     public partial class PlayerPassiveSkillIconListItemCtrl : UIController<PlayerPassiveSkillIconListItemVM>
     {
+        private int _index;
+        private int _passiveSkillId;
+
         protected override void OnEnable(object intent)
         {
             AddUIListenres();
@@ -22,6 +27,7 @@ namespace FL.FGUI
         protected override void OnDisable()
         {
             RemoveUIListenres();
+            _passiveSkillId = 0;
         }
         #region UI事件
         private void AddUIListenres()
@@ -34,5 +40,16 @@ namespace FL.FGUI
         }
 
         #endregion
+
+        public void OnRefresh(int index, JobSkillParam data)
+        {
+            _index = index;
+            _passiveSkillId = data.skillId;
+            var skillInfo = SkillTableRepo.Get(data.skillId);
+            if (skillInfo != null)
+            {
+                VM.SkillIcon.icon = skillInfo.Icon;
+            }
+        }
     }
 }

+ 2 - 2
Assets/Scripts/Business/Runtime/FGUI/Player/PassiveSkillIconListItem/PlayerPassiveSkillIconListItemVM.Gen.cs

@@ -18,11 +18,11 @@ namespace FL.FGUI
     /// </summary>
     public partial class PlayerPassiveSkillIconListItemVM : FguiViewModel
     {
-        public GLoader Icon { get; private set; }
+        public GLoader SkillIcon { get; private set; }
 
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
         {
-            Icon = panel.GetChild("icon") as GLoader;
+            SkillIcon = panel.GetChild("SkillIcon") as GLoader;
 
         }
     }

+ 2 - 3
Assets/Scripts/Business/Runtime/FGUI/Player/PassiveSkillIconListItem/PlayerPassiveSkillIconListItemView.ListItem.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -14,8 +14,7 @@ namespace FL.FGUI
         void IGListItemHandle.OnRefresh(int index, object data)
         {
             ItemIndex = index;
-            //Ctrl.OnRefresh(index, data as GListData);
-            throw new System.NotImplementedException("业务需要实现: PlayerPassiveSkillIconListItemViewCtrl.OnRefresh()");
+            Ctrl.OnRefresh(index, (JobSkillParam)data);
         }
     }
 }

+ 8 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DC9LsSz5Unu3ORe3umObZkq14FWK4wP4u7t/4qUDUaAG/yxcf1hYAgQ=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 75 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedCtrl.cs

@@ -0,0 +1,75 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+using XGame.Database;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    public struct SkillInfoParam 
+    {
+        public bool bShowRightBubble; // 是否显示右侧气泡类型
+        public SkillTable skillInfo;
+    }
+
+    /// <summary>
+    /// UI逻辑处理类
+    /// </summary>
+    /// <typeparam name=""></typeparam>
+    public partial class PlayerSkillInfoNestedCtrl : UIController<PlayerSkillInfoNestedVM>
+    {
+        protected override void OnEnable(object intent)
+        {
+            AddUIListenres();
+            if (intent != null) 
+            {
+                ShowSkillInfo((SkillInfoParam)intent);
+            }
+        }
+        protected override void OnDisable()
+        {
+            RemoveUIListenres();
+        }
+        #region UI事件
+        private void AddUIListenres()
+        {
+
+        }
+        private void RemoveUIListenres()
+        {
+
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 显示技能弹窗信息UI
+        /// </summary>
+        /// <param name="Show"></param>
+        /// <param name="bPassive"></param>
+        public void ShowSkillInfo(SkillInfoParam data)
+        {
+            SkillTable skillInfo = data.skillInfo;
+            if (skillInfo != null)
+            {
+                VM.SkillIcon.icon = skillInfo.Icon;
+                VM.SkillNameLabel.text = skillInfo.Name;
+                VM.SkillDescLabel.text = skillInfo.Desc;
+                int bubbleType = 0;
+                if (skillInfo.ModalityType == 1) // 主动技能
+                {
+                    VM.SkillCdLabel.text = (skillInfo.RestTime * 0.001f).ToString("F1");
+                }
+                else
+                {
+                    bubbleType = 1;
+                }
+                VM.BubbleCtrl.selectedIndex = data.bShowRightBubble ? 2 : bubbleType;
+            }
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Bngbsyz+VXnkUUntZkfG+2nVLdqTylk0U9hSnJ+Du9O1g3oEcBZ6R+M=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 39 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedVM.Gen.cs

@@ -0,0 +1,39 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// #PropertyDefineArea 属性定义区域
+/// #PropertyAssignArea 属性赋值区域
+/// #ComponentType 组件类型
+/// #PropertyName 属性名字
+/// 该脚本由模板创建,不可编辑
+/// created by cb 2024
+using FairyGUI;
+using XGame.Framework.FGUI;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// 该脚本由模板创建,不可修改,不可编辑
+    /// </summary>
+    public partial class PlayerSkillInfoNestedVM : FguiViewModel
+    {
+        public Controller BubbleCtrl { get; private set; }
+        public GLoader SkillIcon { get; private set; }
+        public GTextField SkillNameLabel { get; private set; }
+        public GTextField SkillCdLabel { get; private set; }
+        public GTextField SkillDescLabel { get; private set; }
+        public GGroup UIGroup { get; private set; }
+
+        protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
+        {
+            BubbleCtrl = panel.GetController("BubbleCtrl");
+            SkillIcon = panel.GetChild("SkillIcon") as GLoader;
+            SkillNameLabel = panel.GetChild("SkillNameLabel") as GTextField;
+            SkillCdLabel = panel.GetChild("SkillCdLabel") as GTextField;
+            SkillDescLabel = panel.GetChild("SkillDescLabel") as GTextField;
+            UIGroup = panel.GetChild("UIGroup") as GGroup;
+
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedVM.Gen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Bi4X43mkVipHI7h1+rtumGgjDcW6IQy0DLBMRqPQ3LPDcdBv9AeLFE8=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 23 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedView.cs

@@ -0,0 +1,23 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    public static partial class UINestedKeys
+    {
+        private static UIKey _PlayerSkillInfoNested;
+        public static UIKey PlayerSkillInfoNested => _PlayerSkillInfoNested ?? (_PlayerSkillInfoNested = new UIKey("Player", "SkillInfoNested", typeof(PlayerSkillInfoNestedView)));
+    }
+    public partial class PlayerSkillInfoNestedView : NestedView<PlayerSkillInfoNestedCtrl, PlayerSkillInfoNestedVM>
+    {
+        protected override void OnDispose()
+        {
+        }
+    }
+}
+

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/SkillInfoNested/PlayerSkillInfoNestedView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Xn8bsSr+BnkKgNCQqKl4ePvBF+VSZjlBLHlx3y7EhUkRol/1Mhhkd50=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 30 - 1
Assets/Scripts/Business/Runtime/FGUI/Player/TransferSucessPanel/PlayerTransferSucessPanelCtrl.cs

@@ -31,13 +31,34 @@ namespace FL.FGUI
         private void AddUIListenres()
         {
             VM.BackBtn.onClick.Add(OnClickBackBtn);
-
+            VM.ActiveSkillBtn.onClick.Add(OnClickActiveSkillBtn);
+            VM.PassiveSkillBtn.onClick.Add(OnClickPassiveSkillBtn);
         }
         private void RemoveUIListenres()
         {
             VM.BackBtn.onClick.Remove(OnClickBackBtn);
+            VM.ActiveSkillBtn.onClick.Remove(OnClickActiveSkillBtn);
+            VM.PassiveSkillBtn.onClick.Remove(OnClickPassiveSkillBtn);
+        }
 
+        /// <summary>
+        /// 点击主动技能
+        /// </summary>
+        /// <param name="context"></param>
+        private void OnClickActiveSkillBtn(EventContext context)
+        {
+            OpenPlayerJobInformationPanel();
+        }
+
+        /// <summary>
+        /// 点击被动技能
+        /// </summary>
+        /// <param name="context"></param>
+        private void OnClickPassiveSkillBtn(EventContext context)
+        {
+            OpenPlayerJobInformationPanel();
         }
+
         private void OnClickBackBtn(EventContext context)
         {
             Context.ClosePanel();
@@ -101,5 +122,13 @@ namespace FL.FGUI
         {
             VM.JobSpine.LoadSpine(spineName, "stand", true);
         }
+
+        /// <summary>
+        /// 打开职业详情界面
+        /// </summary>
+        private void OpenPlayerJobInformationPanel()
+        {
+            Context.UI.OpenAsync(UIKeys.PlayerJobInformationPanel);
+        }
     }
 }

+ 4 - 0
Assets/Scripts/Business/Runtime/FGUI/Player/TransferSucessPanel/PlayerTransferSucessPanelVM.Gen.cs

@@ -23,6 +23,8 @@ namespace FL.FGUI
         public GTextField JobName { get; private set; }
         public PlayerAdvacnceSkilNestedView AdvanceSkillItem { get; private set; }
         public PlayerAdvacnceSkilNestedView AdvancePassiveSkillItem { get; private set; }
+        public GButton ActiveSkillBtn { get; private set; }
+        public GButton PassiveSkillBtn { get; private set; }
         public GButton BackBtn { get; private set; }
 
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
@@ -34,6 +36,8 @@ namespace FL.FGUI
             AddChild(AdvanceSkillItem);
             AdvancePassiveSkillItem = adapter.CreateNested<PlayerAdvacnceSkilNestedView>(new FguiNested(panel.GetChild("AdvancePassiveSkillItem").asCom), true);
             AddChild(AdvancePassiveSkillItem);
+            ActiveSkillBtn = panel.GetChild("ActiveSkillBtn") as GButton;
+            PassiveSkillBtn = panel.GetChild("PassiveSkillBtn") as GButton;
             BackBtn = panel.GetChild("BackBtn") as GButton;
 
         }