Browse Source

道具来源跳转

zhenglijun 1 week ago
parent
commit
4687c8d3b1
63 changed files with 1071 additions and 171 deletions
  1. 3 1
      Assets/AssetConfigs/Addressable/CustomSearch.txt
  2. 8 0
      Assets/AssetConfigs/Addressable/ProductAssetManifest.asset
  3. BIN
      Assets/Res/Addressable/FGUI/Bag/Bag_atlas0.png
  4. BIN
      Assets/Res/Addressable/FGUI/Bag/Bag_fui.bytes
  5. BIN
      Assets/Res/Addressable/Tables/DropTable.bytes
  6. BIN
      Assets/Res/Addressable/Tables/ItemTable.bytes
  7. BIN
      Assets/Res/Addressable/Tables/JumpTable.bytes
  8. 7 0
      Assets/Res/Addressable/Tables/JumpTable.bytes.meta
  9. BIN
      Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1015.png
  10. 175 0
      Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1015.png.meta
  11. 3 0
      Assets/Res/Addressable/UI/Atlas/ItemIcon/atlas_rauai_itemicon.spriteatlas
  12. 3 130
      Assets/Res/Addressable/UI/Atlas/SkillIcon/atlas_rauas_skillicon.spriteatlas
  13. 2 2
      Assets/Scripts/Business/Domain/Database/DatabaseVersion.cs
  14. 12 0
      Assets/Scripts/Business/Domain/Database/Repositories/JumpTableRepo.cs
  15. 11 0
      Assets/Scripts/Business/Domain/Database/Repositories/JumpTableRepo.cs.meta
  16. 5 0
      Assets/Scripts/Business/Domain/Database/Tables/ItemTable.cs
  17. 47 0
      Assets/Scripts/Business/Domain/Database/Tables/JumpTable.cs
  18. 11 0
      Assets/Scripts/Business/Domain/Database/Tables/JumpTable.cs.meta
  19. 0 3
      Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelCtrl.cs
  20. 2 2
      Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelView.cs
  21. 8 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem.meta
  22. 61 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemCtrl.cs
  23. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemCtrl.cs.meta
  24. 33 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemVM.Gen.cs
  25. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemVM.Gen.cs.meta
  26. 20 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.ListItem.cs
  27. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.ListItem.cs.meta
  28. 23 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.cs
  29. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.cs.meta
  30. 8 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel.meta
  31. 77 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelCtrl.cs
  32. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelCtrl.cs.meta
  33. 49 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelVM.Gen.cs
  34. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelVM.Gen.cs.meta
  35. 34 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelView.cs
  36. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelView.cs.meta
  37. 8 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel.meta
  38. 68 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelCtrl.cs
  39. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelCtrl.cs.meta
  40. 49 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelVM.Gen.cs
  41. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelVM.Gen.cs.meta
  42. 34 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelView.cs
  43. 11 0
      Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelView.cs.meta
  44. 38 20
      Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/CommonItemBaseCtrl.cs
  45. 8 6
      Assets/Scripts/Business/Runtime/FGUI/DragonEgg/TreasurePanel/DragonEggTreasurePanelCtrl.cs
  46. 4 4
      Assets/Scripts/Business/Runtime/FGUI/Item/InformationPanel/ItemInformationPanelCtrl.cs
  47. 1 0
      Assets/Scripts/Business/Runtime/Nodes/Login/TableComponent.cs
  48. 3 3
      fl-fgui-project/assets/Bag/BackpackPanel.xml
  49. 12 0
      fl-fgui-project/assets/Bag/Components/Btn.xml
  50. 12 0
      fl-fgui-project/assets/Bag/Components/MaxBtn.xml
  51. 12 0
      fl-fgui-project/assets/Bag/Components/NumBtn.xml
  52. BIN
      fl-fgui-project/assets/Bag/Images/anniu01.png
  53. BIN
      fl-fgui-project/assets/Bag/Images/anniu02.png
  54. BIN
      fl-fgui-project/assets/Bag/Images/commonBlueBtn02.png
  55. BIN
      fl-fgui-project/assets/Bag/Images/fenge.png
  56. BIN
      fl-fgui-project/assets/Bag/Images/kuang02.png
  57. BIN
      fl-fgui-project/assets/Bag/Images/shuliangdikuang.png
  58. 12 0
      fl-fgui-project/assets/Bag/JumpListItem.xml
  59. 47 0
      fl-fgui-project/assets/Bag/SourceOfPropsPanel.xml
  60. 37 0
      fl-fgui-project/assets/Bag/UsePanel.xml
  61. BIN
      fl-fgui-project/assets/Bag/cankaotu/ItemIcon_1.png
  62. BIN
      fl-fgui-project/assets/Bag/cankaotu/daojukuang1.png
  63. 14 0
      fl-fgui-project/assets/Bag/package.xml

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

@@ -1,4 +1,4 @@
-545
+547
 Assets/Res/Addressable/Tables/achieveRewardTable.bytes
 Assets/Res/Addressable/Tables/achieveRewardTable.bytes
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0.TTF
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0.TTF
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0 SDF.asset
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0 SDF.asset
@@ -241,6 +241,7 @@ Assets/Res/Addressable/FGUI/Item/Item_atlas0.png
 Assets/Res/Addressable/FGUI/Item/Item_fui.bytes
 Assets/Res/Addressable/FGUI/Item/Item_fui.bytes
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1001.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1001.png
+Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1015.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1024.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1024.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_110101.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_110101.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_110201.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_110201.png
@@ -287,6 +288,7 @@ Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_610601.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_99.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_99.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_power.png
 Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_power.png
 Assets/Res/Addressable/Tables/ItemTable.bytes
 Assets/Res/Addressable/Tables/ItemTable.bytes
+Assets/Res/Addressable/Tables/JumpTable.bytes
 Assets/Res/Addressable/Tables/LevelTable.bytes
 Assets/Res/Addressable/Tables/LevelTable.bytes
 Assets/Res/Addressable/FGUI/Login/Login_atlas_aast4.png
 Assets/Res/Addressable/FGUI/Login/Login_atlas_aast4.png
 Assets/Res/Addressable/FGUI/Login/Login_fui.bytes
 Assets/Res/Addressable/FGUI/Login/Login_fui.bytes

+ 8 - 0
Assets/AssetConfigs/Addressable/ProductAssetManifest.asset

@@ -981,6 +981,10 @@ MonoBehaviour:
     addressableName: itemicon_1001
     addressableName: itemicon_1001
     assetGUID: bca7503cf07c44043aa40ea5a2e4acd5
     assetGUID: bca7503cf07c44043aa40ea5a2e4acd5
     relativePath: 
     relativePath: 
+  - addressableId: 2095738353
+    addressableName: itemicon_1015
+    assetGUID: 0e9f55be1b64a694781ebc3d3a91a454
+    relativePath: 
   - addressableId: 1431021934
   - addressableId: 1431021934
     addressableName: itemicon_1024
     addressableName: itemicon_1024
     assetGUID: 02ebae1b1da4c134793c3d92ed0b39e7
     assetGUID: 02ebae1b1da4c134793c3d92ed0b39e7
@@ -1165,6 +1169,10 @@ MonoBehaviour:
     addressableName: itemtable
     addressableName: itemtable
     assetGUID: 61b047e7ac39c4b498973aeefd90f27f
     assetGUID: 61b047e7ac39c4b498973aeefd90f27f
     relativePath: 
     relativePath: 
+  - addressableId: 535883343
+    addressableName: jumptable
+    assetGUID: 14696f44fcc198f488365f62a17e91b9
+    relativePath: 
   - addressableId: 1122527214
   - addressableId: 1122527214
     addressableName: leveltable
     addressableName: leveltable
     assetGUID: b029160d9857def429e2fa9b91c894dc
     assetGUID: b029160d9857def429e2fa9b91c894dc

BIN
Assets/Res/Addressable/FGUI/Bag/Bag_atlas0.png


BIN
Assets/Res/Addressable/FGUI/Bag/Bag_fui.bytes


BIN
Assets/Res/Addressable/Tables/DropTable.bytes


BIN
Assets/Res/Addressable/Tables/ItemTable.bytes


BIN
Assets/Res/Addressable/Tables/JumpTable.bytes


+ 7 - 0
Assets/Res/Addressable/Tables/JumpTable.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Dn4ZvCz7V3+6KI5CxSAI6BCuLUcPY2fV9hJXiGqGRZfngSi5sJZ0Agw=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1015.png


+ 175 - 0
Assets/Res/Addressable/UI/Atlas/ItemIcon/ItemIcon_1015.png.meta

@@ -0,0 +1,175 @@
+fileFormatVersion: 2
+guid: Dy8W4y+oAS6DLrSXIW/JQXN5LrC44TxmyF3yJwwP76Ej5Uh3Wvn7C9M=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -136,6 +136,7 @@ SpriteAtlas:
     - 400743ddbbab5cb40a1534a491e3e96d: 21300000
     - 400743ddbbab5cb40a1534a491e3e96d: 21300000
     - 6665f3ed45e2ed548b5a06b86b85398d: 21300000
     - 6665f3ed45e2ed548b5a06b86b85398d: 21300000
     - 45f4b0ae2448f9744baee018dc21583d: 21300000
     - 45f4b0ae2448f9744baee018dc21583d: 21300000
+    - 0e9f55be1b64a694781ebc3d3a91a454: 21300000
     - ce26833f5cc3e1948ac8475b2566efc1: 21300000
     - ce26833f5cc3e1948ac8475b2566efc1: 21300000
     - d594797f58341904d9dbe2056c95ba03: 21300000
     - d594797f58341904d9dbe2056c95ba03: 21300000
     - 8bba91af604f8b045ba1dad87aaed685: 21300000
     - 8bba91af604f8b045ba1dad87aaed685: 21300000
@@ -196,6 +197,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 400743ddbbab5cb40a1534a491e3e96d, type: 3}
   - {fileID: 21300000, guid: 400743ddbbab5cb40a1534a491e3e96d, type: 3}
   - {fileID: 21300000, guid: 6665f3ed45e2ed548b5a06b86b85398d, type: 3}
   - {fileID: 21300000, guid: 6665f3ed45e2ed548b5a06b86b85398d, type: 3}
   - {fileID: 21300000, guid: 45f4b0ae2448f9744baee018dc21583d, type: 3}
   - {fileID: 21300000, guid: 45f4b0ae2448f9744baee018dc21583d, type: 3}
+  - {fileID: 21300000, guid: 0e9f55be1b64a694781ebc3d3a91a454, type: 3}
   - {fileID: 21300000, guid: ce26833f5cc3e1948ac8475b2566efc1, type: 3}
   - {fileID: 21300000, guid: ce26833f5cc3e1948ac8475b2566efc1, type: 3}
   - {fileID: 21300000, guid: d594797f58341904d9dbe2056c95ba03, type: 3}
   - {fileID: 21300000, guid: d594797f58341904d9dbe2056c95ba03, type: 3}
   - {fileID: 21300000, guid: 8bba91af604f8b045ba1dad87aaed685, type: 3}
   - {fileID: 21300000, guid: 8bba91af604f8b045ba1dad87aaed685, type: 3}
@@ -255,6 +257,7 @@ SpriteAtlas:
   - daojukuang2
   - daojukuang2
   - ItemIcon_3
   - ItemIcon_3
   - ItemIcon_510401
   - ItemIcon_510401
+  - ItemIcon_1015
   - daojukuang8
   - daojukuang8
   - ItemIcon_310101
   - ItemIcon_310101
   - ItemIcon_410501
   - ItemIcon_410501

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

@@ -80,139 +80,12 @@ SpriteAtlas:
     bindAsDefault: 1
     bindAsDefault: 1
     isAtlasV2: 0
     isAtlasV2: 0
     cachedData: {fileID: 0}
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 3c1576000163de846850a309e6b9c531: 21300000
-    - 9e4e964082d3c7e498c0b6a807155847: 21300000
-    - 4b02fc802b31e3f49942e9e379784ef8: 21300000
-    - eb783e4104694844999f7fe79947e985: 21300000
-    - ac4da3727f20e21449d87b30fc6a12bb: 21300000
-    - 86bb72a2ce0056b49ac28e4a0904043f: 21300000
-    - 14c6a7a260d3b464ea5fe787559c5849: 21300000
-    - ee7942a4b4531e34d854c4052fecda5d: 21300000
-    - 0eae66f469433894bb78c404d1d5dd7f: 21300000
-    - 50205bf456a9abf41a0fd1d51a774178: 21300000
-    - 1120bef4b9139ff4ab42080664de3589: 21300000
-    - e78f9415ea1952a40adfd75bda1a0921: 21300000
-    - 0fb595c5d6441c64590731d049694e3f: 21300000
-    - b2c9d6e53e819d1459527b4f1370cbde: 21300000
-    - dd4249362a2ce4349a0f24fcdab99e86: 21300000
-    - fc611546b4d1d614fb2c02f98cdcc291: 21300000
-    - b3c31f96d6f35304b9549815c13edf51: 21300000
-    - d80f6d2785f904740ac92c78848e2d7c: 21300000
-    - de149248fa30d86448787e87e8c7c129: 21300000
-    - 696b5678f3155fe4d8e28afb4f9139f2: 21300000
-    - 429b500996049b346aad419646a0ee50: 21300000
-    - 76321309f0a16ad42b65c562b27155bb: 21300000
-    - 26073c292d15d5e47ba55a235ac08c07: 21300000
-    - 7d048249b6ecc334493e90225b0cffb2: 21300000
-    - a8ebcff948302dc40a6796275173488c: 21300000
-    - a24d87aa7f1837b48b14b37c907fd947: 21300000
-    - ed7e5c8bd930c424da239e84ebad1ed6: 21300000
-    - 368dfeab669450e41b3bf6a33a2b489c: 21300000
-    - e97f9bcb1270c3643aa6a63e185b33ae: 21300000
-    - 18d680db340f2084989f7dc66b738553: 21300000
-    - 7e7a15eb5df23304c9f17d61c7c95cb3: 21300000
-    - 77c005ac32b21194a91f4b2c7e893f0f: 21300000
-    - a68ac26d16227b4439dd22df28a1baf4: 21300000
-    - 7981276d5c484f84d998749585ed5fcf: 21300000
-    - c2563edd0711d5f429b9a043ce921acf: 21300000
-    - 37cb253eba269a84b8ae3594e14e8b8f: 21300000
-    - 41d5306e9b6ddc044a7de19e45f399af: 21300000
-    - d871888e3dff6b24d86887410860f759: 21300000
-    - 34c0ab8e5ad196d4e80cbe91c9d275c7: 21300000
-    - fe878bae5c25e5f4983488f02c3e043a: 21300000
-    - d69207bec2130b14cb65e0a8cbe33b7b: 21300000
-    - 2a779bdf8897ba04485af057865e57e3: 21300000
-    - 093fabef49be52b4b9e2633f9a9fcf7b: 21300000
+    packedSpriteRenderDataKeys: []
   m_MasterAtlas: {fileID: 0}
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   m_PackedSprites:
-  - {fileID: 21300000, guid: 3c1576000163de846850a309e6b9c531, type: 3}
-  - {fileID: 21300000, guid: 9e4e964082d3c7e498c0b6a807155847, type: 3}
-  - {fileID: 21300000, guid: 4b02fc802b31e3f49942e9e379784ef8, type: 3}
-  - {fileID: 21300000, guid: eb783e4104694844999f7fe79947e985, type: 3}
-  - {fileID: 21300000, guid: ac4da3727f20e21449d87b30fc6a12bb, type: 3}
-  - {fileID: 21300000, guid: 86bb72a2ce0056b49ac28e4a0904043f, type: 3}
-  - {fileID: 21300000, guid: 14c6a7a260d3b464ea5fe787559c5849, type: 3}
-  - {fileID: 21300000, guid: ee7942a4b4531e34d854c4052fecda5d, type: 3}
-  - {fileID: 21300000, guid: 0eae66f469433894bb78c404d1d5dd7f, type: 3}
-  - {fileID: 21300000, guid: 50205bf456a9abf41a0fd1d51a774178, type: 3}
-  - {fileID: 21300000, guid: 1120bef4b9139ff4ab42080664de3589, type: 3}
-  - {fileID: 21300000, guid: e78f9415ea1952a40adfd75bda1a0921, type: 3}
-  - {fileID: 21300000, guid: 0fb595c5d6441c64590731d049694e3f, type: 3}
-  - {fileID: 21300000, guid: b2c9d6e53e819d1459527b4f1370cbde, type: 3}
-  - {fileID: 21300000, guid: dd4249362a2ce4349a0f24fcdab99e86, type: 3}
-  - {fileID: 21300000, guid: fc611546b4d1d614fb2c02f98cdcc291, type: 3}
-  - {fileID: 21300000, guid: b3c31f96d6f35304b9549815c13edf51, type: 3}
-  - {fileID: 21300000, guid: d80f6d2785f904740ac92c78848e2d7c, type: 3}
-  - {fileID: 21300000, guid: de149248fa30d86448787e87e8c7c129, type: 3}
-  - {fileID: 21300000, guid: 696b5678f3155fe4d8e28afb4f9139f2, type: 3}
-  - {fileID: 21300000, guid: 429b500996049b346aad419646a0ee50, type: 3}
-  - {fileID: 21300000, guid: 76321309f0a16ad42b65c562b27155bb, type: 3}
-  - {fileID: 21300000, guid: 26073c292d15d5e47ba55a235ac08c07, type: 3}
-  - {fileID: 21300000, guid: 7d048249b6ecc334493e90225b0cffb2, type: 3}
-  - {fileID: 21300000, guid: a8ebcff948302dc40a6796275173488c, type: 3}
-  - {fileID: 21300000, guid: a24d87aa7f1837b48b14b37c907fd947, type: 3}
-  - {fileID: 21300000, guid: ed7e5c8bd930c424da239e84ebad1ed6, type: 3}
-  - {fileID: 21300000, guid: 368dfeab669450e41b3bf6a33a2b489c, type: 3}
-  - {fileID: 21300000, guid: e97f9bcb1270c3643aa6a63e185b33ae, type: 3}
-  - {fileID: 21300000, guid: 18d680db340f2084989f7dc66b738553, type: 3}
-  - {fileID: 21300000, guid: 7e7a15eb5df23304c9f17d61c7c95cb3, type: 3}
-  - {fileID: 21300000, guid: 77c005ac32b21194a91f4b2c7e893f0f, type: 3}
-  - {fileID: 21300000, guid: a68ac26d16227b4439dd22df28a1baf4, type: 3}
-  - {fileID: 21300000, guid: 7981276d5c484f84d998749585ed5fcf, type: 3}
-  - {fileID: 21300000, guid: c2563edd0711d5f429b9a043ce921acf, type: 3}
-  - {fileID: 21300000, guid: 37cb253eba269a84b8ae3594e14e8b8f, type: 3}
-  - {fileID: 21300000, guid: 41d5306e9b6ddc044a7de19e45f399af, type: 3}
-  - {fileID: 21300000, guid: d871888e3dff6b24d86887410860f759, type: 3}
-  - {fileID: 21300000, guid: 34c0ab8e5ad196d4e80cbe91c9d275c7, type: 3}
-  - {fileID: 21300000, guid: fe878bae5c25e5f4983488f02c3e043a, type: 3}
-  - {fileID: 21300000, guid: d69207bec2130b14cb65e0a8cbe33b7b, type: 3}
-  - {fileID: 21300000, guid: 2a779bdf8897ba04485af057865e57e3, type: 3}
-  - {fileID: 21300000, guid: 093fabef49be52b4b9e2633f9a9fcf7b, type: 3}
+  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
   m_PackedSpriteNamesToIndex:
   m_PackedSpriteNamesToIndex:
-  - SkillIcon_204711
-  - SkillIcon_203311
-  - SkillIcon_204111
-  - SkillIcon_202311
-  - SkillIcon_205111
-  - SkillIcon_20521101
-  - SkillIcon_200701
-  - SkillIcon_202721
-  - SkillIcon_203511
-  - SkillIcon_202211
-  - SkillIcon_202511
-  - SkillIcon_201721
-  - SkillIcon_201211
-  - SkillIcon_201411
-  - SkillIcon_202711
-  - SkillIcon_203111
-  - SkillIcon_203411
-  - SkillIcon_204311
-  - SkillIcon_205511
-  - SkillIcon_205411
-  - SkillIcon_201611
-  - SkillIcon_204511
-  - SkillIcon_202111
-  - SkillIcon_205211
-  - SkillIcon_201711
-  - SkillIcon_205711
-  - SkillIcon_204611
-  - SkillIcon_203211
-  - SkillIcon_205311
-  - SkillIcon_203611
-  - SkillIcon_13521
-  - SkillIcon_204211
-  - SkillIcon_204411
-  - SkillIcon_203721
-  - SkillIcon_202411
-  - SkillIcon_205611
-  - SkillIcon_205721
-  - SkillIcon_204721
-  - SkillIcon_201311
-  - SkillIcon_201111
-  - SkillIcon_202611
-  - SkillIcon_203711
-  - SkillIcon_201511
+  - vcard_img_mingpian_exhbition_bg
   m_RenderDataMap: {}
   m_RenderDataMap: {}
   m_Tag: atlas_rauas_skillicon
   m_Tag: atlas_rauas_skillicon
   m_IsVariant: 0
   m_IsVariant: 0

+ 2 - 2
Assets/Scripts/Business/Domain/Database/DatabaseVersion.cs

@@ -5,7 +5,7 @@ namespace XGame.Database
 {
 {
     public static class DatabaseVersion
     public static class DatabaseVersion
     {
     {
-        // version 1731657554
+        // version 1731664071
         static long _version = -1;
         static long _version = -1;
 
 
         public static long Version
         public static long Version
@@ -14,7 +14,7 @@ namespace XGame.Database
             {
             {
                 if (_version == -1)
                 if (_version == -1)
                 {
                 {
-                    _version = 1731657554;
+                    _version = 1731664071;
                 }
                 }
                 return _version;
                 return _version;
             }
             }

+ 12 - 0
Assets/Scripts/Business/Domain/Database/Repositories/JumpTableRepo.cs

@@ -0,0 +1,12 @@
+// Generate By EToy
+// Don't Edit It!!
+
+using XGame.Framework.Database;
+
+
+namespace XGame.Database
+{
+    public partial class JumpTableRepo : TableRepository<JumpTable, JumpTableRepo>
+    {
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Domain/Database/Repositories/JumpTableRepo.cs.meta

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

+ 5 - 0
Assets/Scripts/Business/Domain/Database/Tables/ItemTable.cs

@@ -36,6 +36,9 @@ namespace XGame.Database
         /// <summary> 时效 </summary>
         /// <summary> 时效 </summary>
         public int Duration { get; private set; }
         public int Duration { get; private set; }
 
 
+        /// <summary> 前往跳转 </summary>
+        public int[] Jump { get; private set; } // c
+
         void ISerializable.Deserialize(IReader reader)
         void ISerializable.Deserialize(IReader reader)
         {
         {
             Id = reader.ReadInt();
             Id = reader.ReadInt();
@@ -48,6 +51,7 @@ namespace XGame.Database
             Effect = reader.ReadEnumerable<int[]>();
             Effect = reader.ReadEnumerable<int[]>();
             RecyclingPrices = reader.ReadInt();
             RecyclingPrices = reader.ReadInt();
             Duration = reader.ReadInt();
             Duration = reader.ReadInt();
+            Jump = reader.ReadEnumerable<int[]>();
         }
         }
 
 
         void ISerializable.Serialize(IWriter writer)
         void ISerializable.Serialize(IWriter writer)
@@ -62,6 +66,7 @@ namespace XGame.Database
             writer.Write(Effect);
             writer.Write(Effect);
             writer.Write(RecyclingPrices);
             writer.Write(RecyclingPrices);
             writer.Write(Duration);
             writer.Write(Duration);
+            writer.Write(Jump);
         }
         }
     }
     }
 }
 }

+ 47 - 0
Assets/Scripts/Business/Domain/Database/Tables/JumpTable.cs

@@ -0,0 +1,47 @@
+// Generate By EToy
+// Don't Edit It!!
+
+using XGame.Framework.Database;
+using XGame.Framework.Serialization;
+
+namespace XGame.Database
+{
+    /// <summary> Jump </summary>
+    public sealed class JumpTable : ITable
+    {
+        long ITable.Key => Id;
+
+        /// <summary> 跳转id </summary>
+        public int Id { get; private set; } // c
+
+        /// <summary> 前往跳转 </summary>
+        public string UI { get; private set; } // c
+
+        /// <summary> 系统名称 </summary>
+        public string Name { get; private set; } // c
+
+        /// <summary> 跳转描述 </summary>
+        public string Desc { get; private set; } // c
+
+        /// <summary> 透传参数 </summary>
+        public int[] Param { get; private set; } // c
+
+        void ISerializable.Deserialize(IReader reader)
+        {
+            Id = reader.ReadInt();
+            UI = reader.ReadString();
+            Name = reader.ReadString();
+            Desc = reader.ReadString();
+            Param = reader.ReadEnumerable<int[]>();
+        }
+
+        void ISerializable.Serialize(IWriter writer)
+        {
+            writer.Write(Id);
+            writer.Write(UI);
+            writer.Write(Name);
+            writer.Write(Desc);
+            writer.Write(Param);
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Domain/Database/Tables/JumpTable.cs.meta

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

+ 0 - 3
Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelCtrl.cs

@@ -4,13 +4,10 @@
 /// 该脚本由模板创建
 /// 该脚本由模板创建
 /// created by cb 2024
 /// created by cb 2024
 
 
-using Codice.CM.Common;
 using FairyGUI;
 using FairyGUI;
 using FL.Data;
 using FL.Data;
 using FL.Data.Items;
 using FL.Data.Items;
-using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
-using System.Net.NetworkInformation;
 using XGame.Database;
 using XGame.Database;
 using XGame.Framework.UI;
 using XGame.Framework.UI;
 
 

+ 2 - 2
Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     }
     public partial class BagBackpackPanelView : UIView
     public partial class BagBackpackPanelView : UIView
     {
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.Middle;
         protected override void AddController(IUIControllerGroup group)
         protected override void AddController(IUIControllerGroup group)
         {
         {
             group.Add(new BagBackpackPanelCtrl());
             group.Add(new BagBackpackPanelCtrl());

+ 8 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WnIcvH7+UnxKjk8gP5G7n8lmeHOo8p/yXa7kBIDFI2Jxqq+J4MIDAYQ=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 61 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemCtrl.cs

@@ -0,0 +1,61 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+using XGame.Database;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// UI逻辑处理类
+    /// </summary>
+    /// <typeparam name=""></typeparam>
+    public partial class BagJumpListItemCtrl : UIController<BagJumpListItemVM>
+    {
+        private JumpTable _jumpInfo;
+        protected override void OnEnable(object intent)
+        {
+            AddUIListenres();
+        }
+        protected override void OnDisable()
+        {
+            RemoveUIListenres();
+        }
+        #region UI事件
+        private void AddUIListenres()
+        {
+            VM.GoBtn.onClick.Add(OnClickGoBtn);
+
+        }
+        private void RemoveUIListenres()
+        {
+            VM.GoBtn.onClick.Remove(OnClickGoBtn);
+
+        }
+        private void OnClickGoBtn(EventContext context)
+        {
+            if (!string.IsNullOrEmpty(_jumpInfo?.UI)) 
+            {
+                Context.UI.OpenAsync(UIKeys.NameToKey(_jumpInfo.UI), _jumpInfo.Param);
+                Context.ClosePanel();
+                Context.UI.Close(UIKeys.BagBackpackPanel);
+            }
+        }
+
+        #endregion
+
+        public void OnRefresh(int index, int jumpId) 
+        {
+            _jumpInfo = JumpTableRepo.Get(jumpId);
+            if (_jumpInfo != null) 
+            {
+                VM.NameLabel.text = _jumpInfo.Name;
+                VM.DescLabel.text = _jumpInfo.Desc;
+            }
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemCtrl.cs.meta

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

+ 33 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemVM.Gen.cs

@@ -0,0 +1,33 @@
+/// #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 BagJumpListItemVM : FguiViewModel
+    {
+        public GButton GoBtn { get; private set; }
+        public GTextField NameLabel { get; private set; }
+        public GTextField DescLabel { get; private set; }
+
+        protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
+        {
+            GoBtn = panel.GetChild("GoBtn") as GButton;
+            NameLabel = panel.GetChild("NameLabel") as GTextField;
+            DescLabel = panel.GetChild("DescLabel") as GTextField;
+
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemVM.Gen.cs.meta

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

+ 20 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.ListItem.cs

@@ -0,0 +1,20 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+
+namespace FL.FGUI
+{
+    public partial class BagJumpListItemView : IGListItemHandle
+    {
+        public int ItemIndex { get; private set; }
+        void IGListItemHandle.OnRefresh(int index, object data)
+        {
+            ItemIndex = index;
+            Ctrl.OnRefresh(index, (int)data);
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.ListItem.cs.meta

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

+ 23 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.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 _BagJumpListItem;
+        public static UIKey BagJumpListItem => _BagJumpListItem ?? (_BagJumpListItem = new UIKey("Bag", "JumpListItem", typeof(BagJumpListItemView)));
+    }
+    public partial class BagJumpListItemView : NestedView<BagJumpListItemCtrl, BagJumpListItemVM>
+    {
+        protected override void OnDispose()
+        {
+        }
+    }
+}
+

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/JumpListItem/BagJumpListItemView.cs.meta

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

+ 8 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XHsatCmpBnO6koq9/+O5rEJwZNfTPjAPG42quHhJykHtyMYbJthtK/0=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 77 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelCtrl.cs

@@ -0,0 +1,77 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+using XGame.Database;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// UI逻辑处理类
+    /// </summary>
+    /// <typeparam name=""></typeparam>
+    public partial class BagSourceOfPropsPanelCtrl : UIController<BagSourceOfPropsPanelVM>
+    {
+        protected override void OnEnable(object intent)
+        {
+            AddUIListenres();
+            if (intent != null)
+            {
+                ShowUI((ItemInfoParam)intent);
+            }
+        }
+        protected override void OnDisable()
+        {
+            RemoveUIListenres();
+        }
+        #region UI事件
+        private void AddUIListenres()
+        {
+            VM.UseBtn.onClick.Add(OnClickUseBtn);
+
+        }
+        private void RemoveUIListenres()
+        {
+            VM.UseBtn.onClick.Remove(OnClickUseBtn);
+
+        }
+        private void OnClickUseBtn(EventContext context)
+        {
+            Context.ClosePanel();
+        }
+
+        #endregion
+
+        private void ShowUI(ItemInfoParam data)
+        {
+            VM.NameLabel.text = data.itemInfo.Name;
+            VM.DescLabel.text = data.itemInfo.Desc;
+            bool bShowNum = data.numDesc != null;
+            VM.CountLabel.visible = bShowNum;
+            if (bShowNum) VM.CountLabel.text = data.numDesc;
+            VM.QualityIcon.icon = AddressableDefine.ItemFrame(data.itemInfo.Quality);
+            VM.ItemIcon.icon = data.itemInfo.Icon;
+            VM.UseBtn.visible = data.itemInfo.Type == (int)EItemType.Gift || data.itemInfo.Type == (int)EItemType.RedEnvelope;
+
+            bool bHideJumpUI = data.itemInfo.Jump?.Length == 0;
+            VM.JumpUICtrl.selectedIndex = bHideJumpUI ? 1 : 0;
+            if (!bHideJumpUI)
+            {
+                ShowJumpUI(data.itemInfo.Jump);
+            }
+        }
+
+        /// <summary>
+        /// 显示来源跳转UI
+        /// </summary>
+        private void ShowJumpUI(int[] jumpIds)
+        {
+            VM.JumpList.BindDatas(jumpIds);
+        }
+
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelCtrl.cs.meta

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

+ 49 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelVM.Gen.cs

@@ -0,0 +1,49 @@
+/// #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 BagSourceOfPropsPanelVM : FguiViewModel
+    {
+        public Controller JumpUICtrl { get; private set; }
+        public CommonBackGroundNestedView MaskBg { get; private set; }
+        public GLabel PopWin { get; private set; }
+        public GLoader QualityIcon { get; private set; }
+        public GLoader ItemIcon { get; private set; }
+        public GButton UseBtn { get; private set; }
+        public GTextField CountLabel { get; private set; }
+        public GTextField NameLabel { get; private set; }
+        public GTextField DescLabel { get; private set; }
+        public GList JumpList { get; private set; }
+
+        protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
+        {
+            JumpUICtrl = panel.GetController("JumpUICtrl");
+            MaskBg = adapter.CreateNested<CommonBackGroundNestedView>(new FguiNested(panel.GetChild("MaskBg").asCom), true);
+            AddChild(MaskBg);
+            PopWin = panel.GetChild("PopWin") as GLabel;
+            QualityIcon = panel.GetChild("QualityIcon") as GLoader;
+            ItemIcon = panel.GetChild("ItemIcon") as GLoader;
+            UseBtn = panel.GetChild("UseBtn") as GButton;
+            CountLabel = panel.GetChild("CountLabel") as GTextField;
+            NameLabel = panel.GetChild("NameLabel") as GTextField;
+            DescLabel = panel.GetChild("DescLabel") as GTextField;
+            JumpList = panel.GetChild("JumpList") as GList;
+            JumpList.Init(typeof(BagJumpListItemView), adapter.CreateListItem);
+
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelVM.Gen.cs.meta

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

+ 34 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelView.cs

@@ -0,0 +1,34 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    public static partial class UIKeys
+    {
+        private static UIKey _BagSourceOfPropsPanel;
+        public static UIKey BagSourceOfPropsPanel => _BagSourceOfPropsPanel ?? (_BagSourceOfPropsPanel = new UIKey("Bag", "SourceOfPropsPanel", typeof(BagSourceOfPropsPanelView)));
+    }
+    public partial class BagSourceOfPropsPanelView : UIView
+    {
+        public static UILayer Layer => UILayer.High;
+        protected override void AddController(IUIControllerGroup group)
+        {
+            group.Add(new BagSourceOfPropsPanelCtrl());
+        }
+
+        protected override IUIViewModel CreateViewModel()
+        {
+            return new BagSourceOfPropsPanelVM();
+        }
+
+        protected override void OnDispose()
+        {
+        }
+    }
+}
+

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WXNMvHyrB3sfTTfdH+lJxD/KDIYuU3DXDjl+iTYH0jYsI46KXCZcWfo=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: By4X5y2rUS5Qr3jJRWWQh+msBUTVqQr6F6a1QPdYD8qZ1Qokd8dd0xU=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 68 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelCtrl.cs

@@ -0,0 +1,68 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// UI逻辑处理类
+    /// </summary>
+    /// <typeparam name=""></typeparam>
+    public partial class BagUsePanelCtrl : UIController<BagUsePanelVM>
+    {
+        protected override void OnEnable(object intent)
+        {
+            AddUIListenres();
+        }
+        protected override void OnDisable()
+        {
+            RemoveUIListenres();
+        }
+        #region UI事件
+        private void AddUIListenres()
+        {
+            VM.UseBtn.onClick.Add(OnClickUseBtn);
+            VM.ReduceOneBtn.onClick.Add(OnClickReduceOneBtn);
+            VM.ReduceTenBtn.onClick.Add(OnClickReduceTenBtn);
+            VM.AddOneBtn.onClick.Add(OnClickAddOneBtn);
+            VM.AddTenBtn.onClick.Add(OnClickAddTenBtn);
+            VM.MaxBtn.onClick.Add(OnClickMaxBtn);
+
+        }
+        private void RemoveUIListenres()
+        {
+            VM.UseBtn.onClick.Remove(OnClickUseBtn);
+            VM.ReduceOneBtn.onClick.Remove(OnClickReduceOneBtn);
+            VM.ReduceTenBtn.onClick.Remove(OnClickReduceTenBtn);
+            VM.AddOneBtn.onClick.Remove(OnClickAddOneBtn);
+            VM.AddTenBtn.onClick.Remove(OnClickAddTenBtn);
+            VM.MaxBtn.onClick.Remove(OnClickMaxBtn);
+
+        }
+        private void OnClickUseBtn(EventContext context)
+        {
+        }
+        private void OnClickReduceOneBtn(EventContext context)
+        {
+        }
+        private void OnClickReduceTenBtn(EventContext context)
+        {
+        }
+        private void OnClickAddOneBtn(EventContext context)
+        {
+        }
+        private void OnClickAddTenBtn(EventContext context)
+        {
+        }
+        private void OnClickMaxBtn(EventContext context)
+        {
+        }
+
+        #endregion
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelCtrl.cs.meta

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

+ 49 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelVM.Gen.cs

@@ -0,0 +1,49 @@
+/// #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 BagUsePanelVM : FguiViewModel
+    {
+        public CommonBackGroundNestedView MaskBg { get; private set; }
+        public GLabel Bg { get; private set; }
+        public CommonItemBaseView ItemBase { get; private set; }
+        public GButton UseBtn { get; private set; }
+        public GButton ReduceOneBtn { get; private set; }
+        public GButton ReduceTenBtn { get; private set; }
+        public GButton AddOneBtn { get; private set; }
+        public GButton AddTenBtn { get; private set; }
+        public GButton MaxBtn { get; private set; }
+        public GTextField NumLabel { get; private set; }
+
+        protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
+        {
+            MaskBg = adapter.CreateNested<CommonBackGroundNestedView>(new FguiNested(panel.GetChild("MaskBg").asCom), true);
+            AddChild(MaskBg);
+            Bg = panel.GetChild("Bg") as GLabel;
+            ItemBase = adapter.CreateNested<CommonItemBaseView>(new FguiNested(panel.GetChild("ItemBase").asCom), true);
+            AddChild(ItemBase);
+            UseBtn = panel.GetChild("UseBtn") as GButton;
+            ReduceOneBtn = panel.GetChild("ReduceOneBtn") as GButton;
+            ReduceTenBtn = panel.GetChild("ReduceTenBtn") as GButton;
+            AddOneBtn = panel.GetChild("AddOneBtn") as GButton;
+            AddTenBtn = panel.GetChild("AddTenBtn") as GButton;
+            MaxBtn = panel.GetChild("MaxBtn") as GButton;
+            NumLabel = panel.GetChild("NumLabel") as GTextField;
+
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelVM.Gen.cs.meta

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

+ 34 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelView.cs

@@ -0,0 +1,34 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    public static partial class UIKeys
+    {
+        private static UIKey _BagUsePanel;
+        public static UIKey BagUsePanel => _BagUsePanel ?? (_BagUsePanel = new UIKey("Bag", "UsePanel", typeof(BagUsePanelView)));
+    }
+    public partial class BagUsePanelView : UIView
+    {
+        public static UILayer Layer => UILayer.Popup;
+        protected override void AddController(IUIControllerGroup group)
+        {
+            group.Add(new BagUsePanelCtrl());
+        }
+
+        protected override IUIViewModel CreateViewModel()
+        {
+            return new BagUsePanelVM();
+        }
+
+        protected override void OnDispose()
+        {
+        }
+    }
+}
+

+ 11 - 0
Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelView.cs.meta

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

+ 38 - 20
Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/CommonItemBaseCtrl.cs

@@ -6,7 +6,6 @@
 
 
 using FairyGUI;
 using FairyGUI;
 using FL.Data.Items;
 using FL.Data.Items;
-using XGame;
 using XGame.Database;
 using XGame.Database;
 using XGame.Framework.UI;
 using XGame.Framework.UI;
 
 
@@ -28,8 +27,8 @@ namespace FL.FGUI
     /// <typeparam name=""></typeparam>
     /// <typeparam name=""></typeparam>
     public partial class CommonItemBaseCtrl : UIController<CommonItemBaseVM>
     public partial class CommonItemBaseCtrl : UIController<CommonItemBaseVM>
     {
     {
-        private IItem data;
-        private bool bShowBaseInfo;
+        private IItem _data;
+        private bool _bShowBaseInfo;
 
 
         protected override void OnEnable(object intent)
         protected override void OnEnable(object intent)
         {
         {
@@ -56,52 +55,70 @@ namespace FL.FGUI
 
 
         private void OnClickBtn(EventContext context)
         private void OnClickBtn(EventContext context)
         {
         {
-            if (data == null)
+            if (_data == null)
             {
             {
                 return;
                 return;
             }
             }
-            else if (bShowBaseInfo)
+            else if (_data?.ItemType == EItemType.Equip)
             {
             {
-                ShowItemInfoPanel();
-            }
-            else if (data?.ItemType == EItemType.Equip)
-            {
-                if (data is EquipItem)
+                if (_data is EquipItem)
                 {
                 {
-                    Context.UI.OpenAsync(UIKeys.EquipEquipPanel, data);
+                    Context.UI.OpenAsync(UIKeys.EquipEquipPanel, _data);
                 }
                 }
                 else
                 else
                     Context.UI.OpenAsync(
                     Context.UI.OpenAsync(
                         UIKeys.EquipEquipPanel,
                         UIKeys.EquipEquipPanel,
-                        EquipData.Instance.GetBagEquipItem(data.Id)
+                        EquipData.Instance.GetBagEquipItem(_data.Id)
                     );
                     );
             }
             }
-            else
+            else if (_bShowBaseInfo)
             {
             {
                 ShowItemInfoPanel();
                 ShowItemInfoPanel();
             }
             }
+            else
+            {
+                ShowSourceOfPropsPanel();
+            }
         }
         }
 
 
+        /// <summary>
+        /// 简易的道具物品信息
+        /// </summary>
         private void ShowItemInfoPanel()
         private void ShowItemInfoPanel()
         {
         {
-            Log.Debug($"显示道具:{data.Name}详情界面");
+            //Log.Debug($"显示道具:{data.Name}详情界面");
             Context.UI.OpenAsync(
             Context.UI.OpenAsync(
                 UIKeys.ItemInformationPanel,
                 UIKeys.ItemInformationPanel,
                 new ItemInfoParam
                 new ItemInfoParam
                 {
                 {
-                    itemInfo = ItemTableRepo.Get(data.TableId),
+                    itemInfo = ItemTableRepo.Get(_data.TableId),
                     numDesc =
                     numDesc =
-                        data?.ItemType == EItemType.Equip
-                            ? $"LV.{data.Level}"
-                            : (int.Parse(data.Count) > 1 ? data.Count : null),
+                        _data?.ItemType == EItemType.Equip
+                            ? $"LV.{_data.Level}"
+                            : (int.Parse(_data.Count) > 1 ? _data.Count : string.Empty),
+                }
+            );
+        }
+
+        /// <summary>
+        /// 道具物品的来源信息界面
+        /// </summary>
+        private void ShowSourceOfPropsPanel()
+        {
+            Context.UI.OpenAsync(
+                UIKeys.BagSourceOfPropsPanel,
+                new ItemInfoParam
+                {
+                    itemInfo = ItemTableRepo.Get(_data.TableId),
+                    numDesc = (int.Parse(_data.Count) > 1 ? _data.Count : string.Empty),
                 }
                 }
             );
             );
         }
         }
 
 
         public void ShowUI(IItem item, UiParam uiParam)
         public void ShowUI(IItem item, UiParam uiParam)
         {
         {
-            data = item;
-            bShowBaseInfo = uiParam.bShowBaseInfo;
+            _data = item;
+            _bShowBaseInfo = uiParam.bShowBaseInfo;
 
 
             VM.QualityImg.icon = AddressableDefine.ItemFrame(item.Quality);
             VM.QualityImg.icon = AddressableDefine.ItemFrame(item.Quality);
 
 
@@ -136,6 +153,7 @@ namespace FL.FGUI
             _uiParam.bShowName = false;
             _uiParam.bShowName = false;
             _uiParam.bShowCount = true;
             _uiParam.bShowCount = true;
             _uiParam.bShowLevel = false;
             _uiParam.bShowLevel = false;
+            _uiParam.bShowBaseInfo = false;
             ShowUI(itemData, _uiParam);
             ShowUI(itemData, _uiParam);
         }
         }
     }
     }

+ 8 - 6
Assets/Scripts/Business/Runtime/FGUI/DragonEgg/TreasurePanel/DragonEggTreasurePanelCtrl.cs

@@ -25,6 +25,7 @@ namespace FL.FGUI
     public partial class DragonEggTreasurePanelCtrl : UIController<DragonEggTreasurePanelVM>
     public partial class DragonEggTreasurePanelCtrl : UIController<DragonEggTreasurePanelVM>
     {
     {
         private bool _bFlyingAni; // 是否处于开龙宝藏飞行动画状态
         private bool _bFlyingAni; // 是否处于开龙宝藏飞行动画状态
+        private int _selectIndex; // 当前选择的龙索引
         private int _useCount; // 使用的品质宝箱数量
         private int _useCount; // 使用的品质宝箱数量
         private int _maxTreasureSocre; // 当前宝藏进度的最大积分值
         private int _maxTreasureSocre; // 当前宝藏进度的最大积分值
         private string _treasureChestName; // 当前宝藏宝箱名称
         private string _treasureChestName; // 当前宝藏宝箱名称
@@ -41,7 +42,7 @@ namespace FL.FGUI
         {
         {
             AddUIListenres();
             AddUIListenres();
             AddEventListener();
             AddEventListener();
-            Init();
+            Init(intent as int[]);
         }
         }
         protected override void OnDisable()
         protected override void OnDisable()
         {
         {
@@ -160,8 +161,10 @@ namespace FL.FGUI
         }
         }
 
 
 
 
-        private void Init()
+        private void Init(int[] paramArray)
         {
         {
+            _selectIndex = paramArray?.Length > 0 ? paramArray[0] : -1;
+
             _bFlyingAni = false;
             _bFlyingAni = false;
             var startPos = VM.DragonSpineBtn.displayObject.TransformPoint(new Vector2(VM.DragonSpineBtn.width / 3, VM.DragonSpineBtn.height / 2), VM.DragonSpineBtn.displayObject);
             var startPos = VM.DragonSpineBtn.displayObject.TransformPoint(new Vector2(VM.DragonSpineBtn.width / 3, VM.DragonSpineBtn.height / 2), VM.DragonSpineBtn.displayObject);
             _startPos = new Vector3(startPos.x, startPos.y, 0);
             _startPos = new Vector3(startPos.x, startPos.y, 0);
@@ -223,17 +226,16 @@ namespace FL.FGUI
         {
         {
             if (_dragonBtnList == null) _dragonBtnList = new List<GButton>() { VM.DragonBtn1, VM.DragonBtn2, VM.DragonBtn3, VM.DragonBtn4, VM.DragonBtn5 };
             if (_dragonBtnList == null) _dragonBtnList = new List<GButton>() { VM.DragonBtn1, VM.DragonBtn2, VM.DragonBtn3, VM.DragonBtn4, VM.DragonBtn5 };
 
 
-            int index = -1;
             for (int i = 0; i < 5; i++)
             for (int i = 0; i < 5; i++)
             {
             {
                 long num = ItemData.Instance.GetItemNum(DragonEggData.Instance.GetTreasureChestId(i));
                 long num = ItemData.Instance.GetItemNum(DragonEggData.Instance.GetTreasureChestId(i));
-                if (num > 0 && index == -1)
+                if (num > 0 && _selectIndex == -1)
                 {
                 {
-                    index = i;
+                    _selectIndex = i;
                     ShowDragonBoxNum(num);
                     ShowDragonBoxNum(num);
                 }
                 }
             }
             }
-            OnSelectDragon(index == -1 ? 0 : index);
+            OnSelectDragon(_selectIndex == -1 ? 0 : _selectIndex);
         }
         }
 
 
         /// <summary>
         /// <summary>

+ 4 - 4
Assets/Scripts/Business/Runtime/FGUI/Item/InformationPanel/ItemInformationPanelCtrl.cs

@@ -5,12 +5,13 @@
 /// created by cb 2024
 /// created by cb 2024
 
 
 using FairyGUI;
 using FairyGUI;
+using System;
 using XGame.Database;
 using XGame.Database;
 using XGame.Framework.UI;
 using XGame.Framework.UI;
 
 
 namespace FL.FGUI
 namespace FL.FGUI
 {
 {
-    public class ItemInfoParam
+    public struct ItemInfoParam
     {
     {
         public ItemTable itemInfo;
         public ItemTable itemInfo;
         public string numDesc;
         public string numDesc;
@@ -25,10 +26,9 @@ namespace FL.FGUI
         protected override void OnEnable(object intent)
         protected override void OnEnable(object intent)
         {
         {
             AddUIListenres();
             AddUIListenres();
-            var data = intent as ItemInfoParam;
-            if (data != null)
+            if (intent != null)
             {
             {
-                ShowUI(data);
+                ShowUI((ItemInfoParam)intent);
             }
             }
         }
         }
         protected override void OnDisable()
         protected override void OnDisable()

+ 1 - 0
Assets/Scripts/Business/Runtime/Nodes/Login/TableComponent.cs

@@ -45,6 +45,7 @@ namespace FL.Nodes.Login
             runeTableRepo.LoadAsync().Join(group);
             runeTableRepo.LoadAsync().Join(group);
             rune_levelTableRepo.LoadAsync().Join(group);
             rune_levelTableRepo.LoadAsync().Join(group);
             rune_expTableRepo.LoadAsync().Join(group);
             rune_expTableRepo.LoadAsync().Join(group);
+            JumpTableRepo.LoadAsync().Join(group);
         }
         }
 
 
         void ILoadAsyncHandle.OnUnloadAsync(IAsyncGroup group)
         void ILoadAsyncHandle.OnUnloadAsync(IAsyncGroup group)

+ 3 - 3
fl-fgui-project/assets/Bag/BackpackPanel.xml

@@ -28,10 +28,10 @@
     </list>
     </list>
     <image id="n5_nf7w" name="n5" src="nf7w3" fileName="Images/shubao.png" xy="62,1068" pivot="0.5,0.5" anchor="true" group="n12_ut64"/>
     <image id="n5_nf7w" name="n5" src="nf7w3" fileName="Images/shubao.png" xy="62,1068" pivot="0.5,0.5" anchor="true" group="n12_ut64"/>
     <component id="n8_xo2n" name="ItemPageBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="431,1101" size="150,86" group="n12_ut64">
     <component id="n8_xo2n" name="ItemPageBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="431,1101" size="150,86" group="n12_ut64">
-      <Button title="道具" icon="ui://y15iuuxvut649" selectedIcon="ui://y15iuuxvut648" controller="PageCtrl" page="1"/>
+      <Button checked="true" title="道具" icon="ui://y15iuuxvut649" selectedIcon="ui://y15iuuxvut648" controller="PageCtrl" page="0"/>
     </component>
     </component>
     <component id="n7_xo2n" name="MaterialPageBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="585,1101" size="150,86" group="n12_ut64">
     <component id="n7_xo2n" name="MaterialPageBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="585,1101" size="150,86" group="n12_ut64">
-      <Button checked="true" title="材料" controller="PageCtrl" page="0"/>
+      <Button title="材料" controller="PageCtrl" page="1"/>
     </component>
     </component>
     <text id="n6_nf7w" name="NumLabel" xy="94,1068" pivot="0,0.5" anchor="true" size="89,36" group="n12_ut64" fontSize="26" color="#ffffff" vAlign="middle" leading="0" strokeColor="#000000" strokeSize="2" text="13/250"/>
     <text id="n6_nf7w" name="NumLabel" xy="94,1068" pivot="0,0.5" anchor="true" size="89,36" group="n12_ut64" fontSize="26" color="#ffffff" vAlign="middle" leading="0" strokeColor="#000000" strokeSize="2" text="13/250"/>
     <text id="n15_tf1p" name="EmptyLabel" xy="378,596" pivot="0.5,0.5" anchor="true" size="244,79" group="n12_ut64" fontSize="60" align="center" vAlign="middle" leading="0" text="空空如也"/>
     <text id="n15_tf1p" name="EmptyLabel" xy="378,596" pivot="0.5,0.5" anchor="true" size="244,79" group="n12_ut64" fontSize="60" align="center" vAlign="middle" leading="0" text="空空如也"/>
@@ -39,5 +39,5 @@
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     </group>
   </displayList>
   </displayList>
-  <scriptData gencodenf7w4="1" genuilayernf7w4="4"/>
+  <scriptData gencodenf7w4="1" genuilayernf7w4="2"/>
 </component>
 </component>

+ 12 - 0
fl-fgui-project/assets/Bag/Components/Btn.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,49" pivot="0.5,0.5" extention="Button">
+  <displayList>
+    <loader id="n0_tf1p" name="icon" xy="83,24" pivot="0.5,0.5" anchor="true" size="166,49" url="ui://y15iuuxvtf1p8" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <text id="n1_tf1p" name="title" xy="83,24" pivot="0.5,0.5" anchor="true" size="56,36" fontSize="26" color="#ffffff" align="center" vAlign="middle" leading="0" strokeColor="#000000" strokeSize="2" autoClearText="true" text="按钮">
+      <relation target="" sidePair="width-width,height-height,center-center"/>
+    </text>
+  </displayList>
+  <Button downEffect="scale" downEffectValue=".9"/>
+</component>

+ 12 - 0
fl-fgui-project/assets/Bag/Components/MaxBtn.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="73,49" pivot="0.5,0.5" extention="Button">
+  <displayList>
+    <image id="n0_tf1p" name="n0" src="tf1pi" fileName="Images/anniu02.png" xy="0,0" size="73,49">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n3_tf1p" name="title" xy="12,8" pivot="0.5,0.5" size="48,32" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" strokeColor="#000000" strokeSize="2" text="最大">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button downEffect="scale" downEffectValue=".9"/>
+</component>

+ 12 - 0
fl-fgui-project/assets/Bag/Components/NumBtn.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="73,49" pivot="0.5,0.5" extention="Button">
+  <displayList>
+    <image id="n0_tf1p" name="n0" src="tf1p8" fileName="Images/anniu01.png" xy="0,0" size="73,49">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n3_tf1p" name="title" xy="13,7" pivot="0.5,0.5" size="46,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" strokeColor="#000000" text="+10">
+      <relation target="" sidePair="width-width,height-height,center-center"/>
+    </text>
+  </displayList>
+  <Button downEffect="scale" downEffectValue=".9"/>
+</component>

BIN
fl-fgui-project/assets/Bag/Images/anniu01.png


BIN
fl-fgui-project/assets/Bag/Images/anniu02.png


BIN
fl-fgui-project/assets/Bag/Images/commonBlueBtn02.png


BIN
fl-fgui-project/assets/Bag/Images/fenge.png


BIN
fl-fgui-project/assets/Bag/Images/kuang02.png


BIN
fl-fgui-project/assets/Bag/Images/shuliangdikuang.png


+ 12 - 0
fl-fgui-project/assets/Bag/JumpListItem.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="653,96">
+  <displayList>
+    <image id="n11_tf1p" name="n11" src="tf1pb" fileName="Images/kuang02.png" xy="0,0" size="653,96"/>
+    <component id="n12_tf1p" name="GoBtn" src="tf1p9" fileName="Components/Btn.xml" xy="478,20" size="156,55">
+      <Button title="前往" icon="ui://y15iuuxvtf1pc"/>
+    </component>
+    <text id="n13_tf1p" name="NameLabel" xy="12,10" pivot="0,0.5" size="172,39" fontSize="28" color="#5f84c6" vAlign="middle" leading="0" autoClearText="true" text="获取物品地点"/>
+    <text id="n14_tf1p" name="DescLabel" xy="13,54" pivot="0,0.5" size="232,32" fontSize="22" color="#9fa7ba" vAlign="middle" leading="0" autoClearText="true" text="获取物品-获取物品地点"/>
+  </displayList>
+  <scriptData genuitypetf1pd="2" gencodetf1pd="1"/>
+</component>

+ 47 - 0
fl-fgui-project/assets/Bag/SourceOfPropsPanel.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="756,1344" opaque="false" designImage="ui://y15iuuxvnf7w2" designImageOffsetX="-366">
+  <controller name="JumpUICtrl" pages="0,,1," selected="0">
+    <remark page="0" value="显示来源"/>
+    <remark page="1" value="隐藏来源跳转UI"/>
+  </controller>
+  <displayList>
+    <component id="n18_tf1p" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="378,672" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <component id="n0_tf1p" name="PopWin" src="sfx630" fileName="Components/PopWin/PopWin.xml" pkg="gt6q23qw" xy="377,284" pivot="0.5,0" anchor="true" size="729,800" group="n25_tf1p">
+      <gearSize controller="JumpUICtrl" pages="1" values="729,352,1,1" default="729,800,1,1"/>
+      <Label title="详情"/>
+    </component>
+    <loader id="n19_tf1p" name="QualityIcon" xy="30,353" pivot="0.5,0.5" size="150,150" group="n25_tf1p" scale="0.75,0.75" touchable="false" url="ui://y15iuuxvtf1pj" align="center" vAlign="middle" autoSize="true" clearOnPublish="true"/>
+    <loader id="n20_tf1p" name="ItemIcon" xy="41,364" pivot="0.5,0.5" size="128,128" group="n25_tf1p" scale="0.75,0.75" touchable="false" url="ui://y15iuuxvtf1pk" align="center" vAlign="middle" autoSize="true" clearOnPublish="true"/>
+    <component id="n4_tf1p" name="UseBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="525,399" size="167,55" group="n25_tf1p" aspect="true">
+      <Button title="使用" titleFontSize="26" icon="ui://y15iuuxvtf1p8"/>
+    </component>
+    <text id="n21_tf1p" name="CountLabel" xy="117,445" pivot="1,0.5" size="34,36" group="n25_tf1p" fontSize="26" color="#ffffff" align="right" vAlign="middle" leading="0" autoClearText="true" text="88"/>
+    <text id="n2_tf1p" name="NameLabel" xy="171,400" pivot="0,0.5" anchor="true" size="148,49" group="n25_tf1p" fontSize="36" color="#e26f5a" vAlign="middle" leading="0" text="物品名称"/>
+    <text id="n5_tf1p" name="DescLabel" xy="50,496" size="666,96" group="n25_tf1p" fontSize="24" color="#49517e" leading="0" autoSize="none" autoClearText="true" text="攻击有冻伤效果的目标,概率出发超导电流,造成连锁N个单位X%真实伤害,伤害从第一个单位往后递减。攻击5层冻伤效果的目标,连锁单位数量增加,伤害不衰减"/>
+    <text id="n6_tf1p" name="n6" xy="378,622" pivot="0.5,0.5" anchor="true" size="108,36" group="n23_tf1p" fontSize="26" color="#5f84c6" align="center" vAlign="middle" leading="0" text="获取途径"/>
+    <image id="n7_tf1p" name="n7" src="tf1p7" fileName="Images/fenge.png" xy="178,622" pivot="0.5,0.5" anchor="true" size="230,12" group="n23_tf1p" color="#5f84c6">
+      <relation target="n6_tf1p" sidePair="middle-middle,right-left"/>
+    </image>
+    <image id="n8_tf1p" name="n8" src="tf1p7" fileName="Images/fenge.png" xy="581,622" pivot="0.5,0.5" anchor="true" size="230,12" group="n23_tf1p" scale="-1,1" color="#5f84c6">
+      <relation target="n6_tf1p" sidePair="middle-middle,left-right"/>
+    </image>
+    <list id="n10_tf1p" name="JumpList" xy="51,655" size="654,368" group="n23_tf1p" overflow="scroll" lineGap="8" defaultItem="ui://y15iuuxvtf1pd" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n23_tf1p" name="n23" xy="51,604" size="654,419" group="n25_tf1p" advanced="true">
+      <gearDisplay controller="JumpUICtrl" pages="0"/>
+    </group>
+    <group id="n25_tf1p" name="n25" xy="12,284" size="729,800" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <text id="n9_tf1p" name="n9" xy="378,1166" pivot="0.5,0.5" anchor="true" size="196,34" fontSize="24" color="#ffffff" leading="0" italic="true" text="点击任意位置关闭">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </text>
+  </displayList>
+  <scriptData gencodetf1p6="1" genuilayertf1p6="3"/>
+</component>

+ 37 - 0
fl-fgui-project/assets/Bag/UsePanel.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="756,1344" designImage="ui://y15iuuxvnf7w1" designImageOffsetX="-68">
+  <displayList>
+    <component id="n12_tf1p" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="378,672" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <component id="n0_tf1p" name="Bg" src="drii3u" fileName="Components/PopWin/PopWin3.xml" pkg="gt6q23qw" xy="377,612" pivot="0.5,0.5" anchor="true" size="729,461" group="n11_tf1p">
+      <Label title="提示"/>
+    </component>
+    <component id="n1_tf1p" name="ItemBase" src="me3q0" fileName="ItemBase.xml" pkg="gt6q23qw" xy="378,550" pivot="0.5,0.5" anchor="true" group="n11_tf1p" scale="0.75,0.75"/>
+    <image id="n3_tf1p" name="n3" src="tf1pf" fileName="Images/shuliangdikuang.png" xy="378,661" pivot="0.5,0.5" anchor="true" size="141,43" group="n11_tf1p"/>
+    <component id="n2_tf1p" name="UseBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="254,737" size="246,81" group="n11_tf1p" aspect="true">
+      <Button title="使用"/>
+    </component>
+    <component id="n7_tf1p" name="ReduceOneBtn" src="tf1pg" fileName="Components/NumBtn.xml" xy="274,637" size="46,49" group="n11_tf1p">
+      <Button title="-"/>
+    </component>
+    <component id="n5_tf1p" name="ReduceTenBtn" src="tf1pg" fileName="Components/NumBtn.xml" xy="195,637" group="n11_tf1p">
+      <Button title="-10"/>
+    </component>
+    <component id="n8_tf1p" name="AddOneBtn" src="tf1pg" fileName="Components/NumBtn.xml" xy="437,637" size="46,49" group="n11_tf1p">
+      <Button title="+"/>
+    </component>
+    <component id="n6_tf1p" name="AddTenBtn" src="tf1pg" fileName="Components/NumBtn.xml" xy="491,637" group="n11_tf1p">
+      <Button title="-10"/>
+    </component>
+    <component id="n10_tf1p" name="MaxBtn" src="tf1ph" fileName="Components/MaxBtn.xml" xy="570,637" group="n11_tf1p"/>
+    <text id="n9_tf1p" name="NumLabel" xy="378,661" pivot="0.5,0.5" anchor="true" size="21,42" group="n11_tf1p" fontSize="30" color="#ffffff" leading="0" text="1"/>
+    <group id="n11_tf1p" name="n11" xy="13,382" size="729,461" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <text id="n13_tf1p" name="n13" xy="378,1166" pivot="0.5,0.5" anchor="true" size="196,34" fontSize="24" color="#ffffff" leading="0" italic="true" text="点击任意位置关闭">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </text>
+  </displayList>
+  <scriptData genuilayertf1pe="4" gencodetf1pe="1"/>
+</component>

BIN
fl-fgui-project/assets/Bag/cankaotu/ItemIcon_1.png


BIN
fl-fgui-project/assets/Bag/cankaotu/daojukuang1.png


+ 14 - 0
fl-fgui-project/assets/Bag/package.xml

@@ -6,6 +6,20 @@
     <image id="nf7w2" name="背包详情.png" path="/NoExport/"/>
     <image id="nf7w2" name="背包详情.png" path="/NoExport/"/>
     <image id="nf7w3" name="shubao.png" path="/Images/"/>
     <image id="nf7w3" name="shubao.png" path="/Images/"/>
     <component id="nf7w4" name="BackpackPanel.xml" path="/" exported="true"/>
     <component id="nf7w4" name="BackpackPanel.xml" path="/" exported="true"/>
+    <component id="tf1p6" name="SourceOfPropsPanel.xml" path="/" exported="true"/>
+    <image id="tf1p7" name="fenge.png" path="/Images/"/>
+    <image id="tf1p8" name="anniu01.png" path="/Images/" scale="9grid" scale9grid="35,18,8,7"/>
+    <component id="tf1p9" name="Btn.xml" path="/Components/"/>
+    <image id="tf1pb" name="kuang02.png" path="/Images/" scale="9grid" scale9grid="25,37,8,7"/>
+    <image id="tf1pc" name="commonBlueBtn02.png" path="/Images/"/>
+    <component id="tf1pd" name="JumpListItem.xml" path="/" exported="true"/>
+    <component id="tf1pe" name="UsePanel.xml" path="/" exported="true"/>
+    <image id="tf1pf" name="shuliangdikuang.png" path="/Images/" scale="9grid" scale9grid="20,16,5,4"/>
+    <component id="tf1pg" name="NumBtn.xml" path="/Components/"/>
+    <component id="tf1ph" name="MaxBtn.xml" path="/Components/"/>
+    <image id="tf1pi" name="anniu02.png" path="/Images/"/>
+    <image id="tf1pj" name="daojukuang1.png" path="/cankaotu/"/>
+    <image id="tf1pk" name="ItemIcon_1.png" path="/cankaotu/"/>
   </resources>
   </resources>
   <publish name="" genCode="true"/>
   <publish name="" genCode="true"/>
 </packageDescription>
 </packageDescription>