装备信息界面修改

Assets/Res/Addressable/FGUI/Mount/Mount_atlas0.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: B35OtSOtWnIE6+ha0kQap2uiaZd45OXBzWa8fZmOgreWqnj9s7nG2ho=
+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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 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: 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: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Addressable/Tables/artifactBaseTable.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3Mes3z8BynHCdwASTYjA+a/CDFOA6AjlXefOwkB3kw1t+P9cv3vK+I=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Addressable/Tables/artifactBuweiTable.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHIftCOrAni9UQj8Z9VHwfbFJ2dMU98q+2sRUy7JS6ilJrkcIJ+NWHg=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Addressable/Tables/artifactInfoTable.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W31OvS2pU3J/uMccVOy5fYpHHqXkExWLSm0LxOKoi83SpDTMXxz4jSQ=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Addressable/Tables/artifactProbTable.bytes.meta

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

Assets/Res/Addressable/Tables/artifactStarTable.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DysctCj+WigpxiPnY+h4trDHf3SWGXJ1LNX2NYR7hw2DKuFLqX6f7KE=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Addressable/UI/Atlas/BuffIcon/atlas_rauab_bufficon.spriteatlas

@@ -80,12 +80,37 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - aba8cff1499f39143b01a4e94b5c5249: 21300000
+    - a9cf5bc2309639046ab11dc5a8340bf9: 21300000
+    - d532c973b3180254fbccd55cf78a10d2: 21300000
+    - 7126bbe75e0e1684999028c51aaccad8: 21300000
+    - db24957bc394d3a41865111856c1c0a9: 21300000
+    - 8f48e65defef92b41864249d6cbcb040: 21300000
+    - 2db9f2be5f8d38d4c8c0c71baa9c5d04: 21300000
+    - b100d5afc5c2d1246bec3acf399a7851: 21300000
+    - 5f682defa872c184b8765d81e4b449f8: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
+  - {fileID: 21300000, guid: aba8cff1499f39143b01a4e94b5c5249, type: 3}
+  - {fileID: 21300000, guid: a9cf5bc2309639046ab11dc5a8340bf9, type: 3}
+  - {fileID: 21300000, guid: d532c973b3180254fbccd55cf78a10d2, type: 3}
+  - {fileID: 21300000, guid: 7126bbe75e0e1684999028c51aaccad8, type: 3}
+  - {fileID: 21300000, guid: db24957bc394d3a41865111856c1c0a9, type: 3}
+  - {fileID: 21300000, guid: 8f48e65defef92b41864249d6cbcb040, type: 3}
+  - {fileID: 21300000, guid: 2db9f2be5f8d38d4c8c0c71baa9c5d04, type: 3}
+  - {fileID: 21300000, guid: b100d5afc5c2d1246bec3acf399a7851, type: 3}
+  - {fileID: 21300000, guid: 5f682defa872c184b8765d81e4b449f8, type: 3}
   m_PackedSpriteNamesToIndex:
-  - vcard_img_mingpian_exhbition_bg
+  - buff_icon_20331101
+  - buff_icon_20171101
+  - buff_icon_1003
+  - buff_icon_205211
+  - buff_icon_1006
+  - buff_icon_1005
+  - buff_icon_1004
+  - buff_icon_20171102
+  - buff_icon_1001
   m_RenderDataMap: {}
   m_Tag: atlas_rauab_bufficon
   m_IsVariant: 0

Assets/Res/Addressable/UI/Atlas/Partner/atlas_rauap_partner.spriteatlas

@@ -80,12 +80,220 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - 7963e680b36428741b28edd9f006d9c9: 21300000
+    - 4e1ed421d3509a2448f2f0fd353fe061: 21300000
+    - be3fca415234a1b4685d1a2573270753: 21300000
+    - fecfa332fbc09b24b98f32c9cc9d421f: 21300000
+    - c6e35a6229056dc4a9a6acd3fc176317: 21300000
+    - 0331f8c29a15a924bbd40992f1db02b0: 21300000
+    - b5ad480345a197643b2a909f75792d20: 21300000
+    - af513c93eea18c542a538ae31fc742cd: 21300000
+    - d00e61b3ec78a25409c3cf7059bd2cd7: 21300000
+    - d75c40140ef5f4847ba7a3d9c3b60fe4: 21300000
+    - d080aa44dd5497c4e8722a9c7ed88ae2: 21300000
+    - 5fb74ab4c6908364fb847afe4bb8ad8a: 21300000
+    - 3e878dc428d246e48bd7d8be197aa2e8: 21300000
+    - 38bd5d155c21afd4bbee617ea6208ddb: 21300000
+    - 62857935cb718254c80306d94a02322c: 21300000
+    - 28e24b65f0c900f47a665b7d05526906: 21300000
+    - d997cfb5985a42e479ee01f698a55f12: 21300000
+    - 24c4f816025819e4f8d8974f9e98d68d: 21300000
+    - 6014f6263903c7e449a4ff273718f898: 21300000
+    - 78a95d26e838c2442a9af4d91cf20d4b: 21300000
+    - 928e7266c93fd9b44ab13c4e72950b4f: 21300000
+    - a489756687ac9bb43a47e99d168c5b81: 21300000
+    - 131aabb6441e4954b9183a33e4f3ca8e: 21300000
+    - 17ecf90731ce6ff4392eeff168cbbf51: 21300000
+    - 24ef1847a11535c419dd65bcca7cabbc: 21300000
+    - b30484c782024804280e6598747ed018: 21300000
+    - c3d88cc7d2d509a49811adbc4a9525c4: 21300000
+    - fd69ead73c6b3124ba67546bbc905594: 21300000
+    - 7e8140f7aafa5ec419b699bf57646c46: 21300000
+    - e7e190f78351d134eaf1408c6eafbe3d: 21300000
+    - 431106185aba18046bee6c24c895b739: 21300000
+    - f517b448493d4524491bf3b483ca7819: 21300000
+    - 0df56f58b15e3074194c5a96db6c4181: 21300000
+    - 1bcaefa8c04acd7419776b6915412804: 21300000
+    - 103cf5198ffe9434f992c85ec0cdb4f7: 21300000
+    - 1cb0b1298af1d0744ad588c352493fdf: 21300000
+    - 46728559ad51d3a47b47707c536655e0: 21300000
+    - 8f7abf694540f0f498e46043d1d151be: 21300000
+    - 0b850ad9f12423f41a855d412e9f29ec: 21300000
+    - 92394c1a1208af644bee54d7e9f73cf3: 21300000
+    - 1303926a12f069640827f2bdcbc0c7c6: 21300000
+    - 3d81a37a927ceb04aa80d928f9794d14: 21300000
+    - 30af1a7abe853734d9eb3e2b062628e6: 21300000
+    - f1b601aa043e7204eb5a34adcc814939: 21300000
+    - 5d1103fa526d54446984e1d8b20d2e8a: 21300000
+    - 626d912bd1d82704da6f14e1a7d36e71: 21300000
+    - 15fb624bff181af4085095606c278112: 21300000
+    - a4f3689b37972234496dd91d79bafdf4: 21300000
+    - 6bc668abf6357a74ca311513ffb36953: 21300000
+    - 838fb90c0e02d454a8442aacba8414e5: 21300000
+    - 30ae4c1c6aad83b4194879ae4e53cffe: 21300000
+    - 820b2ccc16e5fe84bae23af243bfcb60: 21300000
+    - 58e393fc6a6dbf44a99203e46b0a79c6: 21300000
+    - 94fc971df928d6e478bca59d7a236a29: 21300000
+    - 794f7f2d026e2504c8d940726259c269: 21300000
+    - ff78e35de8728a5428e5850a13622edb: 21300000
+    - 46b2b97d5fda8b244a944a99729f4c46: 21300000
+    - 5cc42dadf49af514fbcc4e4003a65f26: 21300000
+    - f3b6079e6d23d5e4b99bd35b91a1d532: 21300000
+    - b9e79cbef0c6aea4ab680a44ac30e9cc: 21300000
+    - 4f3ffcbe3f7219a44a790bae47163632: 21300000
+    - 7f037bcef4637a14d90259f40190a50c: 21300000
+    - ffaafecec25f9d44da7a38472722357e: 21300000
+    - a0e52fce8a7a08b4ab0011094188c4b8: 21300000
+    - 986d0cfe25cbd5a41b1c190cd8b0410e: 21300000
+    - 34ca522fe11e9124eb3e4c75c372ca91: 21300000
+    - b2b9d27f5f31d8141a86896d551c74ec: 21300000
+    - 8e34167fe65877e4299bc86699a11872: 21300000
+    - ed7e619f930a86e4f96668b995953164: 21300000
+    - 4262cecf5fa2e874997471733abc1420: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
+  - {fileID: 21300000, guid: 7963e680b36428741b28edd9f006d9c9, type: 3}
+  - {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: b5ad480345a197643b2a909f75792d20, type: 3}
+  - {fileID: 21300000, guid: af513c93eea18c542a538ae31fc742cd, type: 3}
+  - {fileID: 21300000, guid: d00e61b3ec78a25409c3cf7059bd2cd7, type: 3}
+  - {fileID: 21300000, guid: d75c40140ef5f4847ba7a3d9c3b60fe4, type: 3}
+  - {fileID: 21300000, guid: d080aa44dd5497c4e8722a9c7ed88ae2, type: 3}
+  - {fileID: 21300000, guid: 5fb74ab4c6908364fb847afe4bb8ad8a, type: 3}
+  - {fileID: 21300000, guid: 3e878dc428d246e48bd7d8be197aa2e8, type: 3}
+  - {fileID: 21300000, guid: 38bd5d155c21afd4bbee617ea6208ddb, type: 3}
+  - {fileID: 21300000, guid: 62857935cb718254c80306d94a02322c, type: 3}
+  - {fileID: 21300000, guid: 28e24b65f0c900f47a665b7d05526906, type: 3}
+  - {fileID: 21300000, guid: d997cfb5985a42e479ee01f698a55f12, type: 3}
+  - {fileID: 21300000, guid: 24c4f816025819e4f8d8974f9e98d68d, type: 3}
+  - {fileID: 21300000, guid: 6014f6263903c7e449a4ff273718f898, type: 3}
+  - {fileID: 21300000, guid: 78a95d26e838c2442a9af4d91cf20d4b, type: 3}
+  - {fileID: 21300000, guid: 928e7266c93fd9b44ab13c4e72950b4f, type: 3}
+  - {fileID: 21300000, guid: a489756687ac9bb43a47e99d168c5b81, type: 3}
+  - {fileID: 21300000, guid: 131aabb6441e4954b9183a33e4f3ca8e, type: 3}
+  - {fileID: 21300000, guid: 17ecf90731ce6ff4392eeff168cbbf51, type: 3}
+  - {fileID: 21300000, guid: 24ef1847a11535c419dd65bcca7cabbc, type: 3}
+  - {fileID: 21300000, guid: b30484c782024804280e6598747ed018, type: 3}
+  - {fileID: 21300000, guid: c3d88cc7d2d509a49811adbc4a9525c4, 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: f517b448493d4524491bf3b483ca7819, 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: 46728559ad51d3a47b47707c536655e0, type: 3}
+  - {fileID: 21300000, guid: 8f7abf694540f0f498e46043d1d151be, type: 3}
+  - {fileID: 21300000, guid: 0b850ad9f12423f41a855d412e9f29ec, type: 3}
+  - {fileID: 21300000, guid: 92394c1a1208af644bee54d7e9f73cf3, type: 3}
+  - {fileID: 21300000, guid: 1303926a12f069640827f2bdcbc0c7c6, type: 3}
+  - {fileID: 21300000, guid: 3d81a37a927ceb04aa80d928f9794d14, type: 3}
+  - {fileID: 21300000, guid: 30af1a7abe853734d9eb3e2b062628e6, type: 3}
+  - {fileID: 21300000, guid: f1b601aa043e7204eb5a34adcc814939, type: 3}
+  - {fileID: 21300000, guid: 5d1103fa526d54446984e1d8b20d2e8a, type: 3}
+  - {fileID: 21300000, guid: 626d912bd1d82704da6f14e1a7d36e71, type: 3}
+  - {fileID: 21300000, guid: 15fb624bff181af4085095606c278112, 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: 58e393fc6a6dbf44a99203e46b0a79c6, 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: f3b6079e6d23d5e4b99bd35b91a1d532, type: 3}
+  - {fileID: 21300000, guid: b9e79cbef0c6aea4ab680a44ac30e9cc, type: 3}
+  - {fileID: 21300000, guid: 4f3ffcbe3f7219a44a790bae47163632, type: 3}
+  - {fileID: 21300000, guid: 7f037bcef4637a14d90259f40190a50c, type: 3}
+  - {fileID: 21300000, guid: ffaafecec25f9d44da7a38472722357e, type: 3}
+  - {fileID: 21300000, guid: a0e52fce8a7a08b4ab0011094188c4b8, type: 3}
+  - {fileID: 21300000, guid: 986d0cfe25cbd5a41b1c190cd8b0410e, 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}
   m_PackedSpriteNamesToIndex:
-  - vcard_img_mingpian_exhbition_bg
+  - sb_pzdi_5
+  - partner_pzdi_5
+  - epigraph_pzempty_7
+  - epigraph_pzempty_5
+  - partner_elementType_3
+  - partner_pzdi_2
+  - sb_elementType_4
+  - partner_elementType_2
+  - sb_pzdi_2
+  - partner_pzdi_8
+  - epigraph_pzempty_2
+  - sb_elementType_2
+  - sb_elementTypeRhombus_2
+  - sb_elementTypeRhombus_1
+  - sb_pzdi_7
+  - epigraph_mwpz_8
+  - partner_jindutiao_7
+  - epigraph_mwpz_1
+  - sb_pzdi_8
+  - epigraph_mwpz_7
+  - sb_type_5
+  - epigraph_pztype_4
+  - partner_jindutiao_5
+  - sb_type_2
+  - sb_type_1
+  - epigraph_pztype_3
+  - sb_elementTypeRhombus_3
+  - epigraph_mwpz_6
+  - epigraph_pztype_6
+  - epigraph_pzempty_8
+  - epigraph_mwpz_2
+  - sb_pzdi_3
+  - epigraph_pztype_8
+  - partner_emptydi
+  - partner_jindutiao_2
+  - epigraph_pztype_5
+  - sb_pzdi_4
+  - sb_elementTypeRhombus_4
+  - sb_pzdi_1
+  - partner_jindutiao_1
+  - partner_pzdi_1
+  - sb_elementType_5
+  - epigraph_pztype_2
+  - sb_elementType_3
+  - epigraph_mwpz_4
+  - partner_jindutiao_4
+  - sb_pzdi_6
+  - epigraph_pztype_1
+  - partner_pzdi_4
+  - epigraph_mwpz_3
+  - partner_pzdi_7
+  - partner_pzdi_6
+  - sb_type_4
+  - epigraph_pzempty_1
+  - epigraph_mwpz_5
+  - epigraph_pzempty_3
+  - partner_jindutiao_3
+  - partner_elementType_5
+  - sb_elementTypeRhombus_5
+  - epigraph_pztype_7
+  - epigraph_pzempty_4
+  - sb_type_3
+  - sb_emptydi
+  - partner_jindutiao_8
+  - sb_elementType_1
+  - partner_elementType_1
+  - partner_elementType_4
+  - epigraph_pzempty_6
+  - partner_pzdi_3
+  - partner_jindutiao_6
   m_RenderDataMap: {}
   m_Tag: atlas_rauap_partner
   m_IsVariant: 0

Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_1.png.meta

@@ -112,6 +112,48 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_2.png.meta

@@ -112,6 +112,48 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_3.png.meta

@@ -112,6 +112,48 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_4.png.meta

@@ -112,6 +112,48 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_5.png.meta

@@ -112,6 +112,48 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Scripts/Business/Domain/Database/DatabaseVersion.cs

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

Assets/Scripts/Business/Domain/Database/KeyValue.cs

@@ -28,5 +28,9 @@ namespace XGame.Database
         /// <summary> 【背包格子上限】种类上限，叠加无上限 </summary>
         /// <summary> 100 </summary>
         public static readonly int boxMax = 100;
+
+        /// <summary> 【邮件】邮件数量上限 </summary>
+        /// <summary> 100 </summary>
+        public static readonly int mailMax = 100;
     }
 }

Assets/Scripts/Business/Domain/Database/Repositories/artifactBaseTableRepo.cs

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactBaseTableRepo.cs.meta

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactBuweiTableRepo.cs

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactBuweiTableRepo.cs.meta

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactInfoTableRepo.cs

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactInfoTableRepo.cs.meta

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactProbTableRepo.cs

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactProbTableRepo.cs.meta

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactStarTableRepo.cs

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

Assets/Scripts/Business/Domain/Database/Repositories/artifactStarTableRepo.cs.meta

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

Assets/Scripts/Business/Domain/Database/Tables/artifactBaseTable.cs

@@ -0,0 +1,47 @@
+// Generate By EToy
+// Don't Edit It!!
+
+using XGame.Framework.Database;
+using XGame.Framework.Serialization;
+
+namespace XGame.Database
+{
+    /// <summary> artifactBase </summary>
+    public sealed class artifactBaseTable : ITable
+    {
+        long ITable.Key => Id;
+
+        /// <summary> 秘宝ID </summary>
+        public int Id { get; private set; }
+
+        /// <summary> 秘宝名称 </summary>
+        public string Name { get; private set; }
+
+        /// <summary> 1=普通2=高级 </summary>
+        public int Type { get; private set; }
+
+        /// <summary> 秘宝立绘 </summary>
+        public string Icon { get; private set; }
+
+        /// <summary> 拥有秘宝属性属性id+属性数值 </summary>
+        public int[] StarOwnAttr { get; private set; }
+
+        void ISerializable.Deserialize(IReader reader)
+        {
+            Id = reader.ReadInt();
+            Name = reader.ReadString();
+            Type = reader.ReadInt();
+            Icon = reader.ReadString();
+            StarOwnAttr = reader.ReadEnumerable<int[]>();
+        }
+
+        void ISerializable.Serialize(IWriter writer)
+        {
+            writer.Write(Id);
+            writer.Write(Name);
+            writer.Write(Type);
+            writer.Write(Icon);
+            writer.Write(StarOwnAttr);
+        }
+    }
+}

Assets/Scripts/Business/Domain/Database/Tables/artifactBaseTable.cs.meta

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

Assets/Scripts/Business/Domain/Database/Tables/artifactBuweiTable.cs

@@ -0,0 +1,47 @@
+// Generate By EToy
+// Don't Edit It!!
+
+using XGame.Framework.Database;
+using XGame.Framework.Serialization;
+
+namespace XGame.Database
+{
+    /// <summary> artifactBuwei </summary>
+    public sealed class artifactBuweiTable : ITable
+    {
+        long ITable.Key => Id;
+
+        /// <summary> id1000*元素类型+品质*100+1 </summary>
+        public int Id { get; private set; }
+
+        /// <summary> 元素核心类型1=风2=火3=雷4=冰5=毒 </summary>
+        public int Type { get; private set; }
+
+        /// <summary> 元素核心品质类型1=白2=绿3=蓝4=紫5=橙6=红 </summary>
+        public int Quality { get; private set; }
+
+        /// <summary> 秘宝附魔部位（元素核心1，2，3，4，5位置），道具id </summary>
+        public int[] Level { get; private set; }
+
+        /// <summary> 秘宝元素佩戴属性（属性id+数值） </summary>
+        public int[] LevelOwnAttr { get; private set; }
+
+        void ISerializable.Deserialize(IReader reader)
+        {
+            Id = reader.ReadInt();
+            Type = reader.ReadInt();
+            Quality = reader.ReadInt();
+            Level = reader.ReadEnumerable<int[]>();
+            LevelOwnAttr = reader.ReadEnumerable<int[]>();
+        }
+
+        void ISerializable.Serialize(IWriter writer)
+        {
+            writer.Write(Id);
+            writer.Write(Type);
+            writer.Write(Quality);
+            writer.Write(Level);
+            writer.Write(LevelOwnAttr);
+        }
+    }
+}

Assets/Scripts/Business/Domain/Database/Tables/artifactBuweiTable.cs.meta

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

Assets/Scripts/Business/Domain/Database/Tables/artifactInfoTable.cs

@@ -0,0 +1,42 @@
+// Generate By EToy
+// Don't Edit It!!
+
+using XGame.Framework.Database;
+using XGame.Framework.Serialization;
+
+namespace XGame.Database
+{
+    /// <summary> artifactInfo </summary>
+    public sealed class artifactInfoTable : ITable
+    {
+        long ITable.Key => Id;
+
+        /// <summary> 序号ID </summary>
+        public int Id { get; private set; }
+
+        /// <summary> 秘宝等级 </summary>
+        public int Star { get; private set; }
+
+        /// <summary> 升级道具升级道具ID，升级经验消耗数量 </summary>
+        public int[] StepUpCost { get; private set; }
+
+        /// <summary> 升级获得属性加成属性id+属性数值 </summary>
+        public int[] StarOwnAttr { get; private set; }
+
+        void ISerializable.Deserialize(IReader reader)
+        {
+            Id = reader.ReadInt();
+            Star = reader.ReadInt();
+            StepUpCost = reader.ReadEnumerable<int[]>();
+            StarOwnAttr = reader.ReadEnumerable<int[]>();
+        }
+
+        void ISerializable.Serialize(IWriter writer)
+        {
+            writer.Write(Id);
+            writer.Write(Star);
+            writer.Write(StepUpCost);
+            writer.Write(StarOwnAttr);
+        }
+    }
+}

Assets/Scripts/Business/Domain/Database/Tables/artifactInfoTable.cs.meta

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

Assets/Scripts/Business/Domain/Database/Tables/artifactProbTable.cs

@@ -0,0 +1,52 @@
+// Generate By EToy
+// Don't Edit It!!
+
+using XGame.Framework.Database;
+using XGame.Framework.Serialization;
+
+namespace XGame.Database
+{
+    /// <summary> artifactProb </summary>
+    public sealed class artifactProbTable : ITable
+    {
+        long ITable.Key => Id;
+
+        /// <summary> 序号IDid*1000+部位*100+类型*10+1 </summary>
+        public int Id { get; private set; }
+
+        /// <summary> 元素核心部位 </summary>
+        public int PetId { get; private set; } // sc
+
+        /// <summary> 元素核心类型1=风2=火3=雷4=冰5=毒 </summary>
+        public int Type { get; private set; }
+
+        /// <summary> 元素核心等级 </summary>
+        public int Level { get; private set; } // sc
+
+        /// <summary> 升级消耗元素核心ID，升级元素核心所消耗数量 </summary>
+        public int[] StarUpCost { get; private set; } // sc
+
+        /// <summary> 秘宝元素核心属性属性名称1，属性值 </summary>
+        public int[] StarOwnAttr { get; private set; } // sc
+
+        void ISerializable.Deserialize(IReader reader)
+        {
+            Id = reader.ReadInt();
+            PetId = reader.ReadInt();
+            Type = reader.ReadInt();
+            Level = reader.ReadInt();
+            StarUpCost = reader.ReadEnumerable<int[]>();
+            StarOwnAttr = reader.ReadEnumerable<int[]>();
+        }
+
+        void ISerializable.Serialize(IWriter writer)
+        {
+            writer.Write(Id);
+            writer.Write(PetId);
+            writer.Write(Type);
+            writer.Write(Level);
+            writer.Write(StarUpCost);
+            writer.Write(StarOwnAttr);
+        }
+    }
+}

Assets/Scripts/Business/Domain/Database/Tables/artifactProbTable.cs.meta

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

Assets/Scripts/Business/Domain/Database/Tables/artifactStarTable.cs

@@ -0,0 +1,57 @@
+// Generate By EToy
+// Don't Edit It!!
+
+using XGame.Framework.Database;
+using XGame.Framework.Serialization;
+
+namespace XGame.Database
+{
+    /// <summary> artifactStar </summary>
+    public sealed class artifactStarTable : ITable
+    {
+        long ITable.Key => Id;
+
+        /// <summary> id </summary>
+        public int Id { get; private set; }
+
+        /// <summary> 阶级 </summary>
+        public int Step { get; private set; }
+
+        /// <summary> 星级 </summary>
+        public int Star { get; private set; }
+
+        /// <summary> 进阶消耗道具id+数量 </summary>
+        public int[] StarNeed { get; private set; }
+
+        /// <summary> 升星道具道具id+数量 </summary>
+        public int[] StepUpCost { get; private set; }
+
+        /// <summary> 升级获得属性加成属性id+属性数值 </summary>
+        public int[] StarOwnAttr { get; private set; }
+
+        /// <summary> 解锁道具道具id+数量 </summary>
+        public int[] Itemid { get; private set; }
+
+        void ISerializable.Deserialize(IReader reader)
+        {
+            Id = reader.ReadInt();
+            Step = reader.ReadInt();
+            Star = reader.ReadInt();
+            StarNeed = reader.ReadEnumerable<int[]>();
+            StepUpCost = reader.ReadEnumerable<int[]>();
+            StarOwnAttr = reader.ReadEnumerable<int[]>();
+            Itemid = reader.ReadEnumerable<int[]>();
+        }
+
+        void ISerializable.Serialize(IWriter writer)
+        {
+            writer.Write(Id);
+            writer.Write(Step);
+            writer.Write(Star);
+            writer.Write(StarNeed);
+            writer.Write(StepUpCost);
+            writer.Write(StarOwnAttr);
+            writer.Write(Itemid);
+        }
+    }
+}

Assets/Scripts/Business/Domain/Database/Tables/artifactStarTable.cs.meta

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

Assets/Scripts/Business/Domain/Database/Tables/partnerStarUpTable.cs

@@ -21,7 +21,7 @@ namespace XGame.Database
         /// <summary> 升星消耗同ID伙伴的数量 </summary>
         public int StarUpCost { get; private set; } // sc
 
-        /// <summary> 属性名称1，属性值，属性名称2，属性值…… </summary>
+        /// <summary> 属性名称1，属性值，属性名称2，属性值(圣兵拥有属性增加) </summary>
         public int[] StarOwnAttr { get; private set; } // sc
 
         /// <summary> 技能ID（到达对应星级后解锁）（技能id+技能id） </summary>

Assets/Scripts/Business/Domain/Database/Tables/zuoqiBaseTable.cs

@@ -26,6 +26,9 @@ namespace XGame.Database
         /// <summary> 拥有坐骑属性属性id+属性数值 </summary>
         public int[] StarOwnAttr { get; private set; }
 
+        /// <summary> 坐骑头像 </summary>
+        public string Icon2 { get; private set; }
+
         void ISerializable.Deserialize(IReader reader)
         {
             Id = reader.ReadInt();
@@ -33,6 +36,7 @@ namespace XGame.Database
             Type = reader.ReadInt();
             Icon = reader.ReadString();
             StarOwnAttr = reader.ReadEnumerable<int[]>();
+            Icon2 = reader.ReadString();
         }
 
         void ISerializable.Serialize(IWriter writer)
@@ -42,6 +46,7 @@ namespace XGame.Database
             writer.Write(Type);
             writer.Write(Icon);
             writer.Write(StarOwnAttr);
+            writer.Write(Icon2);
         }
     }
 }

Assets/Scripts/Business/Domain/Database/Tables/zuoqiStarTable.cs

@@ -20,7 +20,7 @@ namespace XGame.Database
         /// <summary> 等级 </summary>
         public int Level { get; private set; }
 
-        /// <summary> 升星道具道具id+数量 </summary>
+        /// <summary> 升星道具道具id+升星所需数量 </summary>
         public int[] StarUpCost { get; private set; }
 
         /// <summary> 升星获得属性加成属性id+属性数值 </summary>
@@ -29,6 +29,9 @@ namespace XGame.Database
         /// <summary> 额外坐骑技能技能id </summary>
         public int[] StarSkill { get; private set; }
 
+        /// <summary> 升星预览1=展示额外技能效果属性不配置=不展示 </summary>
+        public int Preview { get; private set; } // c
+
         void ISerializable.Deserialize(IReader reader)
         {
             Id = reader.ReadInt();
@@ -37,6 +40,7 @@ namespace XGame.Database
             StarUpCost = reader.ReadEnumerable<int[]>();
             LevelOwnAttr = reader.ReadEnumerable<int[]>();
             StarSkill = reader.ReadEnumerable<int[]>();
+            Preview = reader.ReadInt();
         }
 
         void ISerializable.Serialize(IWriter writer)
@@ -47,6 +51,7 @@ namespace XGame.Database
             writer.Write(StarUpCost);
             writer.Write(LevelOwnAttr);
             writer.Write(StarSkill);
+            writer.Write(Preview);
         }
     }
 }

Assets/Scripts/Business/Domain/Network/act_job_class.cs

@@ -31,6 +31,7 @@ namespace FL.Network
         /// <summary> 方案subPoint </summary>
         public System.Collections.Generic.List<RunePlan> runePlan;
 
+        /// <summary> 当前方案 </summary>
         public int currentPlan;
 
         /// <summary> 总点数 </summary>

Assets/Scripts/Business/Domain/Network/act_shengbing.cs

@@ -28,6 +28,9 @@ namespace FL.Network
         /// <summary> 当前使用的方案id </summary>
         public int useSuit;
 
+        /// <summary> 上阵圣兵信息 </summary>
+        public System.Collections.Generic.List<ActShengBingCao> shangzhen;
+
     }
 
     /// <summary> id=201801 </summary>
@@ -84,5 +87,18 @@ namespace FL.Network
 
     }
 
+    /// <summary> id=201805 </summary>
+    public sealed partial class ActShengbingShangzhenPush : IMsgPush
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 201805;
+        public void Clear()
+        {
+        }
+        public System.Collections.Generic.List<ActShengBingCao> shangzhen;
+
+    }
+
 }
 

Assets/Scripts/Business/Domain/Network/act_shop.cs

@@ -19,7 +19,7 @@ namespace FL.Network
         /// <summary> 1杂货 </summary>
         public int hdcid;
 
-        /// <summary> undefined </summary>
+        /// <summary> 商品列表 </summary>
         public System.Collections.Generic.List<Goods> goods;
 
         /// <summary> 下一次刷新时间 </summary>

Assets/Scripts/Business/Domain/Network/act_task_main.cs

@@ -16,8 +16,10 @@ namespace FL.Network
         public void Clear()
         {
         }
+        /// <summary> ID </summary>
         public int id;
 
+        /// <summary> 完成进度 </summary>
         public int cons;
 
     }

Assets/Scripts/Business/Domain/Network/mail_c.cs

@@ -37,6 +37,36 @@ namespace FL.Network
 
     }
 
+    /// <summary> id=100506 </summary>
+    public sealed partial class MailRedAllRequest : IMsgRequest
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 100506;
+        public void Clear()
+        {
+        }
+    }
+
+    /// <summary> id=100506 </summary>
+    public sealed partial class MailRedAllResponse : IMsgResponse
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 100506;
+        public void Clear()
+        {
+        }
+        long IMsgResponse.GetCode() => code;
+        string IMsgResponse.GetInfo() => msg;
+        /// <summary> 消息返回类型0正常 1业务报错 2其他 </summary>
+        public int code;
+
+        /// <summary> 返回提示 </summary>
+        public string msg;
+
+    }
+
     /// <summary> id=100503 </summary>
     public sealed partial class MailRwdAllRequest : IMsgRequest
     {

Assets/Scripts/Business/Domain/Network/model/act_jjc_log_m.cs

@@ -9,6 +9,7 @@ namespace FL.Network
 
     public sealed partial class ActJjcLog
     {
+        /// <summary> 日志id </summary>
         public int xhid;
 
         /// <summary> 出手方 </summary>

Assets/Scripts/Business/Domain/Network/model/act_shengbing_m.cs

@@ -58,5 +58,18 @@ namespace FL.Network
 
     }
 
+    public sealed partial class ActShengBingCao
+    {
+        /// <summary> 圣兵槽id </summary>
+        public int caoId;
+
+        /// <summary> 圣兵id </summary>
+        public int sbId;
+
+        /// <summary> 铭文id </summary>
+        public int mwId;
+
+    }
+
 }
 

Assets/Scripts/Business/Domain/Network/model/act_shop_m.cs

@@ -9,10 +9,13 @@ namespace FL.Network
 
     public sealed partial class Goods
     {
+        /// <summary> 商品id </summary>
         public int id;
 
+        /// <summary> 购买次数 </summary>
         public int buyCount;
 
+        /// <summary> 额外获取道具的次数 </summary>
         public int exCount;
 
     }

Assets/Scripts/Business/Domain/Network/shengbing_c.cs

@@ -7,6 +7,39 @@ using XGame.Framework.Network;
 namespace FL.Network
 {
 
+    /// <summary> id=102112 </summary>
+    public sealed partial class ShengbingUnlockJibanAllRequest : IMsgRequest
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 102112;
+        public void Clear()
+        {
+        }
+        /// <summary> 羁绊id </summary>
+        public int collectId;
+
+    }
+
+    /// <summary> id=102112 </summary>
+    public sealed partial class ShengbingUnlockJibanAllResponse : IMsgResponse
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 102112;
+        public void Clear()
+        {
+        }
+        long IMsgResponse.GetCode() => code;
+        string IMsgResponse.GetInfo() => msg;
+        /// <summary> 消息返回类型0正常 1业务报错 2其他 </summary>
+        public int code;
+
+        /// <summary> 返回提示 </summary>
+        public string msg;
+
+    }
+
     /// <summary> id=102110 </summary>
     public sealed partial class ShengbingUpdateSuitRequest : IMsgRequest
     {
@@ -58,7 +91,7 @@ namespace FL.Network
         public void Clear()
         {
         }
-        /// <summary> 羁绊详情id </summary>
+        /// <summary> 羁绊详情id(每个等级一条的id) </summary>
         public int jiban;
 
     }
@@ -178,12 +211,48 @@ namespace FL.Network
 
     }
 
-    /// <summary> id=102111 </summary>
+    /// <summary> id=102113 </summary>
+    public sealed partial class ShengbingNewWearRequest : IMsgRequest
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 102113;
+        public void Clear()
+        {
+        }
+        /// <summary> 上阵槽ID </summary>
+        public int caoId;
+
+        /// <summary> 圣兵ID </summary>
+        public int sbId;
+
+    }
+
+    /// <summary> id=102113 </summary>
+    public sealed partial class ShengbingNewWearResponse : IMsgResponse
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 102113;
+        public void Clear()
+        {
+        }
+        long IMsgResponse.GetCode() => code;
+        string IMsgResponse.GetInfo() => msg;
+        /// <summary> 消息返回类型0正常 1业务报错 2其他 </summary>
+        public int code;
+
+        /// <summary> 返回提示 </summary>
+        public string msg;
+
+    }
+
+    /// <summary> id=102116 </summary>
     public sealed partial class ShengbingUnfixRequest : IMsgRequest
     {
         int IMessage.InstanceID { get; set; }
         object IMessage.Context { get; set; }
-        int IMessage.ProtocolID => 102111;
+        int IMessage.ProtocolID => 102116;
         public void Clear()
         {
         }
@@ -195,12 +264,48 @@ namespace FL.Network
 
     }
 
-    /// <summary> id=102111 </summary>
+    /// <summary> id=102116 </summary>
     public sealed partial class ShengbingUnfixResponse : IMsgResponse
     {
         int IMessage.InstanceID { get; set; }
         object IMessage.Context { get; set; }
-        int IMessage.ProtocolID => 102111;
+        int IMessage.ProtocolID => 102116;
+        public void Clear()
+        {
+        }
+        long IMsgResponse.GetCode() => code;
+        string IMsgResponse.GetInfo() => msg;
+        /// <summary> 消息返回类型0正常 1业务报错 2其他 </summary>
+        public int code;
+
+        /// <summary> 返回提示 </summary>
+        public string msg;
+
+    }
+
+    /// <summary> id=102114 </summary>
+    public sealed partial class ShengbingNewUnfixRequest : IMsgRequest
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 102114;
+        public void Clear()
+        {
+        }
+        /// <summary> 上阵槽ID </summary>
+        public int caoId;
+
+        /// <summary> 圣兵ID </summary>
+        public int sbId;
+
+    }
+
+    /// <summary> id=102114 </summary>
+    public sealed partial class ShengbingNewUnfixResponse : IMsgResponse
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 102114;
         public void Clear()
         {
         }

Assets/Scripts/Business/Runtime/Data/DragonEggService.cs

@@ -1,7 +1,5 @@
-using FL.Data.Items;
-using FL.Network;
+using FL.Network;
 using System;
-using XGame;
 using XGame.Framework.Data;
 using XGame.Framework.Network;
 

Assets/Scripts/Business/Runtime/Data/Equipe/EquipData.cs

@@ -197,7 +197,7 @@ namespace FL
         {
             EquipmentTable equipInfo = EquipmentTableRepo.Get(equipData.equipId);
             EquipAttr _equipItem = new EquipAttr();
-            _equipItem.Init(equipInfo, equipData.buwei);
+            _equipItem.Init(equipInfo, 0);
             _equipItem.Level = equipData.level;
             if (equipData?.eps?.Count > 0)
             {

Assets/Scripts/Business/Runtime/Data/Items/ItemService.cs

@@ -1,5 +1,4 @@
 using FL.Data.Items;
-using XGame;
 using XGame.Database;
 using XGame.Framework.Data;
 
@@ -29,20 +28,27 @@ namespace FL.Data
             }
         }
 
+        /// <summary>
+        /// 给界面上Itembase展示用,KindItem道具类型kind：技术定义类型 0默认道具表id 1装备临时库序号ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="count"></param>
+        /// <param name="kind"></param>
+        /// <returns></returns>
         public IItemBase GetItemBase(int id, int count, int kind)
         {
-            if (kind == 0)
-            {
-                var item = new ItemBase();
-                item.Init(id, count);
-                return item;
-            }
-            else
+            if (kind == 1) 
             {
                 var equipItem = new EquipItemBase();
                 equipItem.InitById(id);
                 return equipItem;
             }
+            else
+            {
+                var item = new ItemBase();
+                item.Init(id, count);
+                return item;
+            }
         }
     }
 }

Assets/Scripts/Business/Runtime/Data/Mount/MountData.cs

@@ -5,6 +5,12 @@ namespace FL
 {
     public class MountData : DataSingleton<MountData>, IDisposable
     {
+        public int starLv { set; get; }     // 通用坐骑的星级(对应的zuoqiInfo表)
+        public int exp { set; get; }        // 通用坐骑升星进度条
+        public int useMountId { set; get; } // 使用的坐骑id
+        public int useSkillId { set; get; } // 启用的高级坐骑的技能id
+        public int mountPartExp{  set; get; }// 坐骑部位驯养经验条
+
         void IDisposable.Dispose()
         {
 

Assets/Scripts/Business/Runtime/Data/Mount/MountService.cs

@@ -1,9 +1,82 @@
-using XGame.Framework.Data;
+using FL.Network;
+using XGame.Framework.Data;
+using XGame.Framework.Network;
 
 namespace FL
 {
     public class MountService : DataSingleton<MountService>
     {
-        
+        /// <summary>
+        /// 一键提升通用坐骑
+        /// </summary>
+        public void SendToOneKeyUpgrade()
+        {
+            NetModule.Request(new MountWearAllRequest() { });
+        }
+
+        /// <summary>
+        /// 通用坐骑升阶，提升
+        /// </summary>
+        public void SendToUpgrade()
+        {
+            NetModule.Request(new MountTishengRequest() { });
+        }
+
+
+        /// <summary>
+        /// 启用高级坐骑技能
+        /// </summary>
+        /// <param name="mountId">坐骑id</param>
+        public void SendToEnableAdvancedSkill(int mountId)
+        {
+            var msg = new MountUseSkillRequest()
+            {
+                mountId = mountId
+            };
+            NetModule.Request(msg);
+        }
+
+        /// <summary>
+        /// 坐骑上阵(骑乘)
+        /// </summary>
+        /// <param name="mountId"></param>
+        public void SendToRideMount(int mountId) 
+        {
+            var msg = new MountShangzhenRequest()
+            {
+                mountId = mountId
+            };
+            NetModule.Request(msg);
+        }
+
+        /// <summary>
+        /// 坐骑部位一键驯养
+        /// </summary>
+        public void SendToOneKeyTraining()
+        {
+            NetModule.Request(new MountXunyangAllRequest() { });
+        }
+
+        /// <summary>
+        /// 坐骑部位驯养
+        /// </summary>
+        public void SendToTrainingMountPart()
+        {
+            NetModule.Request(new MountXunyangRequest() { });
+        }
+
+        /// <summary>
+        /// 高级坐骑升星
+        /// </summary>
+        /// <param name="mountId"></param>
+        public void SendToUpgradeStar(int mountId)
+        {
+            var msg = new MountUpStarRequest()
+            {
+                mountId = mountId
+            };
+            NetModule.Request(msg);
+        }
+
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelCtrl.cs

@@ -89,7 +89,7 @@ namespace FL.FGUI
             foreach (var item in bagDataMap)
             {
                 ItemTable itemInfo = ItemTableRepo.Get(item.Value.tableId);
-                if (itemInfo.Type == (int)EItemType.Gift || itemInfo.Type == (int)EItemType.RedEnvelope || itemInfo.Type == (int)EItemType.Props)
+                if (itemInfo != null &&(itemInfo.Type == (int)EItemType.Gift || itemInfo.Type == (int)EItemType.RedEnvelope || itemInfo.Type == (int)EItemType.Props))
                 {
                     ItemBase itemBase = new ItemBase();
                     itemBase.Init(itemInfo.Id, item.Value.num);

Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/CommonItemBaseCtrl.cs

@@ -53,7 +53,7 @@ namespace FL.FGUI
             }
             else
             {
-                //Context.UI.OpenAsync(UIKeys.EquipEquipPanel, );
+                Context.UI.OpenAsync(UIKeys.EquipEquipPanel, _data);
             }
         }
 

Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/EquipItemBase.cs

@@ -1,5 +1,4 @@
-using XGame;
-using XGame.Database;
+using XGame.Database;
 
 namespace FL.Data.Items
 {
@@ -38,47 +37,38 @@ namespace FL.Data.Items
 
         public string Icon => _itemTable?.Icon;
 
+        /// <summary>
+        /// 根据uid从装备背包获取装备信息
+        /// </summary>
+        /// <param name="id"></param>
         public void InitById(int id)
         {
             var attr = EquipData.Instance.GetBagEquipItem(id);
-            if (attr == null)
-            {
-                Log.Error($"装备信息不存在，id:{id}");
-                return;
-            }
+            XGame.Framework.Assert.IsNotNull(attr, $"装备信息不存在，id:{id}");
             Id = id;
+            Level = attr.Level;
             var tableId = attr.TableId;
             _table = EquipmentTableRepo.Get(tableId);
-            if (_table == null)
-            {
-                Log.Error($"装备表不存在，id:{tableId}");
-            }
+            XGame.Framework.Assert.IsNotNull(_table, $"装备表不存在，id:{tableId}");
             _itemTable = ItemTableRepo.Get(tableId);
-            if (_itemTable == null)
-            {
-                Log.Error($"道具表不存在，id:{tableId}");
-            }
-        }
-        public void InitByBuwei(EEquipType buwei)
+            XGame.Framework.Assert.IsNotNull(_itemTable, $"道具表不存在，id:{tableId}");
+        }
+
+        /// <summary>
+        /// 根据装备部位从身上穿戴的装备获取装备信息
+        /// </summary>
+        /// <param name="id"></param>
+        public void InitByEquipPart(EEquipType equipPart)
         {
-            var attr = EquipData.Instance.GetWearEquipData(buwei);
-            if (attr == null)
-            {
-                Log.Error($"装备信息不存在，部位id:{buwei}");
-                return;
-            }
+            var attr = EquipData.Instance.GetWearEquipData(equipPart);
+            XGame.Framework.Assert.IsNotNull(attr, $"装备信息不存在，部位id:{equipPart}");
             Id = 0;
+            Level = attr.Level;
             var tableId = attr.TableId;
             _table = EquipmentTableRepo.Get(tableId);
-            if (_table == null)
-            {
-                Log.Error($"装备表不存在，id:{tableId}");
-            }
+            XGame.Framework.Assert.IsNotNull(_table, $"装备表不存在，id:{tableId}");
             _itemTable = ItemTableRepo.Get(tableId);
-            if (_itemTable == null)
-            {
-                Log.Error($"道具表不存在，id:{tableId}");
-            }
+            XGame.Framework.Assert.IsNotNull(_itemTable, $"道具表不存在，id:{tableId}");
         }
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Equip/EquipItemNested/EquipEquipItemNestedCtrl.cs

@@ -4,7 +4,6 @@
 /// 该脚本由模板创建
 /// created by cb 2024
 
-using FL.Data;
 using FL.Data.Items;
 using System.Collections.Generic;
 using XGame.Database;
@@ -88,7 +87,16 @@ namespace FL.FGUI
 
         private void ShowEquipItemUI(EquipAttr equipData)
         {
-            VM.ItemBtn.Ctrl.ShowUI(ItemService.Instance.GetItemBase(equipData.Id, 0, 1));
+            var equipBase = new EquipItemBase();
+            if (equipData.Id == 0)
+            {
+                equipBase.InitByEquipPart(equipData.EquipType);
+            }
+            else
+            {
+                equipBase.InitById(equipData.Id);
+            }
+            VM.ItemBtn.Ctrl.ShowUI(equipBase);
             VM.NameLabel.text = equipData.Name;
             VM.NameLabel.color = equipData.Quality.ToEquipNameColor();
         }

Assets/Scripts/Business/Runtime/FGUI/Equip/EquipPanel/EquipEquipPanelCtrl.cs

@@ -24,7 +24,7 @@ namespace FL.FGUI
         protected override void OnEnable(object intent)
         {
             AddUIListenres();
-            ShowUI(intent as EquipAttr);
+            ShowUI(intent as EquipItemBase);
         }
         protected override void OnDisable()
         {
@@ -62,21 +62,21 @@ namespace FL.FGUI
             Context.ClosePanel();
         }
 
-        private void ShowUI(EquipAttr equipData)
+        private void ShowUI(EquipItemBase equipBase)
         {
-            if (equipData == null) return;
-            if (equipData?.EquipType > 0)
+            if (equipBase == null) return;
+            _wearEquip = EquipData.Instance.GetWearEquipData(equipBase.EquipType);
+            if (_wearEquip != null)
             {
-                _wearEquip = EquipData.Instance.GetWearEquipData(equipData.EquipType);
-                if (_wearEquip?.Id == equipData.Id)
-                {
-                    ShowEquipInfo(_wearEquip);
-                    VM.WearEquipItem.Disable();
-                    return;
-                }
+                ShowEquipInfo(_wearEquip);
+                VM.WearEquipItem.Disable();
+            }
+            if (equipBase.Id == 0) // 身上穿戴的装备
+            {
+                return;
             }
 
-            _newEquip = equipData;
+            _newEquip = EquipData.Instance.GetBagEquipItem(equipBase.Id);
             if (_newEquip == null) return;
 
             bool bShowWear = _wearEquip != null;

Assets/Scripts/Business/Runtime/FGUI/Item/GetItemPanel/ItemGetItemPanelCtrl.cs

@@ -8,12 +8,14 @@ using FairyGUI;
 using FL.Data;
 using FL.Data.Items;
 using FL.Network;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using XGame.Database;
 using XGame.Framework;
 using XGame.Framework.Time;
 using XGame.Framework.UI;
+using static UnityEditor.Progress;
 
 namespace FL.FGUI
 {
@@ -38,8 +40,10 @@ namespace FL.FGUI
             RemoveUIListenres();
             RemoveEventLisenter();
             ClearTimer();
-            if (_waitEquipIdList != null ) _waitEquipIdList.Clear();
-            if (_dropItems != null ) _dropItems.Clear();
+            _waitEquipIdList?.Clear();
+            _waitEquipIdList = null;
+            _dropItems?.Clear();
+            _dropItems = null;
             EquipData.Instance.ClearTemporaryEquipList();
         }
 
@@ -99,20 +103,12 @@ namespace FL.FGUI
  
             ShowBtn(false);
 
-            //if (_dropItems == null)
-            //{
-            //    _dropItems = new List<KindItem>();
-            //}
-            //if (ObtainData?.dropItems != null)
-            //{
-            //    _dropItems.AddRange(ObtainData.dropItems);
-            //}
-
-            ShowDropUI();
             if (IsShowOneKeyBtn())
             {
                 ShowEquipUI();
             }
+            else
+                ShowDropUI();
         }
 
         private void ShowDropUI()
@@ -181,6 +177,7 @@ namespace FL.FGUI
                     }
                 }
             }
+            RefreshUI();
             if (highEquipMap.Count > 0)
             {
                 DelayToShowHighEquip(highEquipMap);
@@ -242,10 +239,16 @@ namespace FL.FGUI
         /// </summary>
         private void ShowEquipEquipPanel()
         {
-            if (_waitEquipIdList.Count > 0)
+            if (_waitEquipIdList?.Count > 0)
             {
                 EquipData.Instance.BubblingEquipUid = _waitEquipIdList[0];
-                Context.UI.OpenAsync(UIKeys.EquipEquipPanel, EquipData.Instance.GetTemporaryEquipItem(_waitEquipIdList[0]));
+                EquipAttr equipData = EquipData.Instance.GetTemporaryEquipItem(_waitEquipIdList[0]);
+                if (equipData != null)
+                {
+                    var equipBase = new EquipItemBase();
+                    equipBase.InitById(equipData.Id);
+                    Context.UI.OpenAsync(UIKeys.EquipEquipPanel, equipBase);
+                }
             }
             else
             {
@@ -262,14 +265,14 @@ namespace FL.FGUI
         private void WearEquipSucess(int eventId, object args)
         {
             var changEquipIdList = args as HashSet<long>;
-            if (changEquipIdList != null)
+            if (changEquipIdList != null && _waitEquipIdList?.Count > 0)
             {
                 foreach (var item in changEquipIdList)
                 {
                     _waitEquipIdList.Remove(item);
                 }
             }
-            RefreshUI();
+            //RefreshUI();
         }
 
         /// <summary>
@@ -293,7 +296,7 @@ namespace FL.FGUI
             {
                 foreach(var id in removeIds)
                 {
-                    _waitEquipIdList.Remove(id);
+                    _waitEquipIdList?.Remove(id);
                     _dropItems = _dropItems.FindAll(item =>(item.count > 0 || item.id != id));
                 }
             }
@@ -321,14 +324,10 @@ namespace FL.FGUI
             {
                 if (EquipData.Instance.BubblingEquipUid > 0)
                 {
-                    _waitEquipIdList.Remove(EquipData.Instance.BubblingEquipUid);
+                    _waitEquipIdList?.Remove(EquipData.Instance.BubblingEquipUid);
                     EquipData.Instance.BubblingEquipUid = 0;
                     ShowEquipEquipPanel();
                 }
-                else
-                {
-                    //RefreshUI();
-                }
             }
         }
 
@@ -402,8 +401,8 @@ namespace FL.FGUI
         {
             _dropItems.Sort((aItem, bItem) =>
             {
-                int aEquipFlag = aItem.count == 0 ? 1 : 0;
-                int bEquipFlag = bItem.count == 0 ? 1 : 0;
+                int aEquipFlag = aItem.kind == 1 ? 1 : 0;
+                int bEquipFlag = bItem.kind == 1 ? 1 : 0;
 
                 if (aEquipFlag == bEquipFlag)
                 {
@@ -422,24 +421,22 @@ namespace FL.FGUI
                             return bEquipData.FightingPower.CompareTo(aEquipData.FightingPower); //降序
                         }
                         else
-                            return bHighPower.CompareTo(aHighPower);
+                            return bHighPower - aHighPower;
                     }
                     return aItem.count.CompareTo(bItem.count);
 
                 }
-                return bEquipFlag.CompareTo(aEquipFlag);//降序
+                return bEquipFlag - aEquipFlag;//降序
             });
         }
 
         private int GetCompareValue(EquipAttr equipData)
         {
             int compareFlag = 0;
-            if (equipData?.Table?.Part > 0)
+            if (equipData?.Table.Part > 0)
             {
-                long compareFightingPower = equipData?.FightingPower ?? 0;
                 var equipItem = EquipData.Instance.GetWearEquipData(equipData.Table.Part);
-                long wearFightingPower = equipItem?.FightingPower ?? 0;
-                if (compareFightingPower > wearFightingPower)
+                if (equipData.FightingPower > (equipItem?.FightingPower ?? 0) )
                     compareFlag = 1;
             }
             return compareFlag;

Assets/Scripts/Business/Runtime/FGUI/Player/MainPanel/PlayerMainPanelCtrl.cs

@@ -188,7 +188,7 @@ namespace FL.FGUI
                 if (equipData != null)
                 {
                     var equipBase = new EquipItemBase();
-                    equipBase.InitById(equipBase.Id);
+                    equipBase.InitByEquipPart(equipData.EquipType);
                     item.Ctrl.ShowUI(equipBase);
                 }
                 else
@@ -219,7 +219,7 @@ namespace FL.FGUI
                     if (equipItem != null)
                     {
                         var equipItemBase = new EquipItemBase();
-                        equipItemBase.InitByBuwei(equipPart);
+                        equipItemBase.InitByEquipPart(equipPart);
                         equipItem.Ctrl.ShowUI(equipItemBase);
                     }
                 }

Assets/Scripts/Business/Runtime/Network/Controllers/ActEquipChuanPushCtrl.cs

@@ -22,9 +22,9 @@ namespace FL.Network
                     wearEquip = new EquipAttr();
                 }
 
-                wearEquip.Init(EquipmentTableRepo.Get(item.equipId), wearEquip == null ? item.buwei : wearEquip.Id);
+                wearEquip.Init(EquipmentTableRepo.Get(item.equipId), wearEquip.Id);
                 wearEquip.Level = item.level;
-                wearEquip.FightingPower = item.power;//EquipData.Instance.GetEquipPower(item.eps);
+                wearEquip.FightingPower = item.power;
                 wearEquip.Attributes.Clear();
                 foreach (var attr in item.eps)
                 {

Assets/Scripts/Business/Runtime/Network/Controllers/ActMountPushCtrl.cs

@@ -1,4 +1,4 @@
-using XGame.Framework.Network;
+using XGame.Framework.Network;
 
 namespace FL.Network
 {
@@ -6,6 +6,7 @@ namespace FL.Network
     {
         protected override void OnProcess(ActMountPush message, object context)
         {
+
         }
     }
 }

Assets/Scripts/Business/Runtime/Network/Controllers/ActShengbingShangzhenPushCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class ActShengbingShangzhenPushCtrl : MsgController<ActShengbingShangzhenPush>
+    {
+        protected override void OnProcess(ActShengbingShangzhenPush message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/ActShengbingShangzhenPushCtrl.cs.meta

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

Assets/Scripts/Business/Runtime/Network/Controllers/MailRedAllResponseCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class MailRedAllResponseCtrl : MsgController<MailRedAllResponse>
+    {
+        protected override void OnProcess(MailRedAllResponse message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/MailRedAllResponseCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CnMZtC6vVy3/t4QhHfqp4j+bNY8+h+n1/mWq86GDRI38hmNxGnHNDDA=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/Network/Controllers/ShengbingNewUnfixResponseCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class ShengbingNewUnfixResponseCtrl : MsgController<ShengbingNewUnfixResponse>
+    {
+        protected override void OnProcess(ShengbingNewUnfixResponse message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/ShengbingNewUnfixResponseCtrl.cs.meta

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

Assets/Scripts/Business/Runtime/Network/Controllers/ShengbingNewWearResponseCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class ShengbingNewWearResponseCtrl : MsgController<ShengbingNewWearResponse>
+    {
+        protected override void OnProcess(ShengbingNewWearResponse message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/ShengbingNewWearResponseCtrl.cs.meta

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

Assets/Scripts/Business/Runtime/Network/Controllers/ShengbingUnlockJibanAllResponseCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class ShengbingUnlockJibanAllResponseCtrl : MsgController<ShengbingUnlockJibanAllResponse>
+    {
+        protected override void OnProcess(ShengbingUnlockJibanAllResponse message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/ShengbingUnlockJibanAllResponseCtrl.cs.meta

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

Assets/Scripts/Business/Runtime/Network/FLMsgGenerator.cs

@@ -28,6 +28,7 @@ namespace FL.Network
                 case 100503: return new MailRwdAllResponseCtrl();
                 case 100504: return new MailDelResponseCtrl();
                 case 100505: return new MailDelAllResponseCtrl();
+                case 100506: return new MailRedAllResponseCtrl();
                 case 100601: return new EquipIntoEquipResponseCtrl();
                 case 100602: return new EquipIntoLsResponseCtrl();
                 case 100603: return new EquipTihuanResponseCtrl();
@@ -71,6 +72,10 @@ namespace FL.Network
                 case 102109: return new ShengbingBindingResponseCtrl();
                 case 102110: return new ShengbingUpdateSuitResponseCtrl();
                 case 102111: return new ShengbingUnlockJibanResponseCtrl();
+                case 102112: return new ShengbingUnlockJibanAllResponseCtrl();
+                case 102113: return new ShengbingNewWearResponseCtrl();
+                case 102114: return new ShengbingNewUnfixResponseCtrl();
+                case 102116: return new ShengbingUnfixResponseCtrl();
                 case 102201: return new MingwenIntoResponseCtrl();
                 case 102202: return new MingwenUpStarResponseCtrl();
                 case 102203: return new MingwenWearAllResponseCtrl();
@@ -135,6 +140,7 @@ namespace FL.Network
                 case 201802: return new ActShengbingSuitPushCtrl();
                 case 201803: return new ActShengbingUseSuitPushCtrl();
                 case 201804: return new ActShengbingJibanPushCtrl();
+                case 201805: return new ActShengbingShangzhenPushCtrl();
                 case 201900: return new ActMingWenPushCtrl();
                 case 201901: return new ActMingwenMingwenPushCtrl();
                 case 201902: return new ActMingwenJibanPushCtrl();
@@ -231,6 +237,7 @@ namespace FL.Network
                 case 100503: return new MailRwdAllResponse();
                 case 100504: return new MailDelResponse();
                 case 100505: return new MailDelAllResponse();
+                case 100506: return new MailRedAllResponse();
                 case 100601: return new EquipIntoEquipResponse();
                 case 100602: return new EquipIntoLsResponse();
                 case 100603: return new EquipTihuanResponse();
@@ -274,6 +281,10 @@ namespace FL.Network
                 case 102109: return new ShengbingBindingResponse();
                 case 102110: return new ShengbingUpdateSuitResponse();
                 case 102111: return new ShengbingUnlockJibanResponse();
+                case 102112: return new ShengbingUnlockJibanAllResponse();
+                case 102113: return new ShengbingNewWearResponse();
+                case 102114: return new ShengbingNewUnfixResponse();
+                case 102116: return new ShengbingUnfixResponse();
                 case 102201: return new MingwenIntoResponse();
                 case 102202: return new MingwenUpStarResponse();
                 case 102203: return new MingwenWearAllResponse();
@@ -338,6 +349,7 @@ namespace FL.Network
                 case 201802: return new ActShengbingSuitPush();
                 case 201803: return new ActShengbingUseSuitPush();
                 case 201804: return new ActShengbingJibanPush();
+                case 201805: return new ActShengbingShangzhenPush();
                 case 201900: return new ActMingWenPush();
                 case 201901: return new ActMingwenMingwenPush();
                 case 201902: return new ActMingwenJibanPush();
@@ -434,6 +446,7 @@ namespace FL.Network
                 case 100503: return typeof(MailRwdAllResponse);
                 case 100504: return typeof(MailDelResponse);
                 case 100505: return typeof(MailDelAllResponse);
+                case 100506: return typeof(MailRedAllResponse);
                 case 100601: return typeof(EquipIntoEquipResponse);
                 case 100602: return typeof(EquipIntoLsResponse);
                 case 100603: return typeof(EquipTihuanResponse);
@@ -477,6 +490,10 @@ namespace FL.Network
                 case 102109: return typeof(ShengbingBindingResponse);
                 case 102110: return typeof(ShengbingUpdateSuitResponse);
                 case 102111: return typeof(ShengbingUnlockJibanResponse);
+                case 102112: return typeof(ShengbingUnlockJibanAllResponse);
+                case 102113: return typeof(ShengbingNewWearResponse);
+                case 102114: return typeof(ShengbingNewUnfixResponse);
+                case 102116: return typeof(ShengbingUnfixResponse);
                 case 102201: return typeof(MingwenIntoResponse);
                 case 102202: return typeof(MingwenUpStarResponse);
                 case 102203: return typeof(MingwenWearAllResponse);
@@ -541,6 +558,7 @@ namespace FL.Network
                 case 201802: return typeof(ActShengbingSuitPush);
                 case 201803: return typeof(ActShengbingUseSuitPush);
                 case 201804: return typeof(ActShengbingJibanPush);
+                case 201805: return typeof(ActShengbingShangzhenPush);
                 case 201900: return typeof(ActMingWenPush);
                 case 201901: return typeof(ActMingwenMingwenPush);
                 case 201902: return typeof(ActMingwenJibanPush);

fl-fgui-project/assets/Common/Components/PopWin/PopWin6.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="756,466" extention="Label" designImage="ui://s58m5vbw9sqt2" designImageOffsetX="-195">
+<component size="756,466" extention="Label">
   <displayList>
     <image id="n0_f8ih" name="n0" src="e5qdp" fileName="images/pop/huodekuangdiban.png" xy="0,0" size="756,466"/>
-    <image id="n1_f8ih" name="n1" src="e5qdo" fileName="images/pop/huodekuang.png" xy="0,-45"/>
+    <image id="n1_f8ih" name="n1" src="e5qdo" fileName="images/pop/huodekuang.png" xy="0,-80"/>
+    <text id="n2_ec0l" name="n2" xy="378,52" pivot="0.5,0.5" anchor="true" size="196,64" fontSize="48" color="#164f86" align="center" vAlign="middle" leading="0" autoClearText="true" text="升级成功"/>
   </displayList>
 </component>

fl-fgui-project/assets/Common/package.xml

@@ -65,7 +65,7 @@
     <component id="j7sp54" name="PopWin5.xml" path="/Components/PopWin/" exported="true"/>
     <image id="e5qdo" name="huodekuang.png" path="/images/pop/"/>
     <image id="e5qdp" name="huodekuangdiban.png" path="/images/pop/" scale="9grid" scale9grid="14,47,15,2"/>
-    <component id="f8ih55" name="PopWin6.xml" path="/Components/PopWin/"/>
+    <component id="f8ih55" name="PopWin6.xml" path="/Components/PopWin/" exported="true"/>
   </resources>
   <publish name="" genCode="true" excluded="q0v63z,ifoa3y"/>
 </packageDescription>

fl-fgui-project/assets/Equip/EquipItemNested.xml

@@ -10,7 +10,7 @@
       <gearColor controller="state" pages="1" values="#ff0000,#000000" default="#000000,#000000"/>
       <gearText controller="state" pages="0,1" values="当前装备|New"/>
     </text>
-    <component id="n2_ja3r" name="ItemBtn" src="me3q0" fileName="ItemBase.xml" pkg="gt6q23qw" xy="12,74" group="n15_qkwl" scale="0.67,0.67"/>
+    <component id="n2_ja3r" name="ItemBtn" src="me3q0" fileName="ItemBase.xml" pkg="gt6q23qw" xy="12,74" group="n15_qkwl" scale="0.67,0.67" touchable="false"/>
     <image id="n3_ja3r" name="n3" src="rwcw5" fileName="images/pop/tanchuangdiban3.png" pkg="gt6q23qw" xy="158,76" size="425,210" group="n15_qkwl"/>
     <text id="n4_ja3r" name="NameLabel" xy="175,84" pivot="0,0.5" size="236,42" group="n15_qkwl" fontSize="30" color="#ffffff" vAlign="middle" strokeColor="#000000" text="[精良]冒险者小帽"/>
     <component id="n5_fr8z" name="HpAttrItem" src="fr8z2p" fileName="AttrItemNested.xml" xy="176,133" group="n9_fr8z"/>

fl-fgui-project/assets/Mount/Components/MountStar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="140,35">
-  <controller name="StarLvCtrl" pages="1,,2,,3,,4,,5,,6," selected="0">
+  <controller name="StarLvCtrl" pages="1,,2,,3,,4,,5,,6," selected="1">
     <remark page="0" value="0星"/>
     <remark page="1" value="1星"/>
     <remark page="2" value="2星"/>
@@ -9,20 +9,23 @@
     <remark page="5" value="5星"/>
   </controller>
   <displayList>
-    <image id="n43_j7sp" name="n43" src="j7spr" fileName="Images/star1.png" xy="18,17" pivot="0.5,0.5" anchor="true">
-      <gearDisplay controller="StarLvCtrl" pages="1,2,3,4,5,6"/>
-    </image>
-    <image id="n47_j7sp" name="n47" src="j7spr" fileName="Images/star1.png" xy="44,17" pivot="0.5,0.5" anchor="true">
+    <loader id="n43_j7sp" name="StarIcon4" xy="70,17" pivot="0.5,0.5" anchor="true" size="36,35" group="n49_ec0l" url="ui://s58m5vbwj7spr" align="center" vAlign="middle" autoSize="true" clearOnPublish="true">
+      <gearDisplay controller="StarLvCtrl" pages="5,6"/>
+    </loader>
+    <loader id="n47_j7sp" name="StarIcon2" xy="96,17" pivot="0.5,0.5" anchor="true" size="36,35" group="n49_ec0l" url="ui://s58m5vbwj7spr" clearOnPublish="true">
       <gearDisplay controller="StarLvCtrl" pages="3,4,5,6"/>
-    </image>
-    <image id="n44_j7sp" name="n44" src="j7spr" fileName="Images/star1.png" xy="70,17" pivot="0.5,0.5" anchor="true">
+    </loader>
+    <loader id="n44_j7sp" name="StarIcon1" xy="70,17" pivot="0.5,0.5" anchor="true" size="36,35" group="n49_ec0l" url="ui://s58m5vbwj7spr" clearOnPublish="true">
+      <gearDisplay controller="StarLvCtrl" pages="1,2,3,4,5,6"/>
+    </loader>
+    <loader id="n45_j7sp" name="StarIcon3" xy="148,17" pivot="0.5,0.5" anchor="true" size="36,35" group="n49_ec0l" url="ui://s58m5vbwj7spr" clearOnPublish="true">
       <gearDisplay controller="StarLvCtrl" pages="4,5,6"/>
-    </image>
-    <image id="n45_j7sp" name="n45" src="j7spr" fileName="Images/star1.png" xy="96,17" pivot="0.5,0.5" anchor="true">
-      <gearDisplay controller="StarLvCtrl" pages="5,6"/>
-    </image>
-    <image id="n46_j7sp" name="n46" src="j7spr" fileName="Images/star1.png" xy="122,17" pivot="0.5,0.5" anchor="true">
+    </loader>
+    <loader id="n46_j7sp" name="StarIcon5" xy="174,17" pivot="0.5,0.5" anchor="true" size="36,35" group="n49_ec0l" url="ui://s58m5vbwj7spr" clearOnPublish="true">
       <gearDisplay controller="StarLvCtrl" pages="6"/>
-    </image>
+    </loader>
+    <group id="n49_ec0l" name="n49" xy="52,0" size="36,35" advanced="true" layout="hz" colGap="-10" excludeInvisibles="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
 </component>

fl-fgui-project/assets/Mount/MountListItem.xml

@@ -23,4 +23,5 @@
       <gearDisplay controller="LockCtrl" pages="1"/>
     </image>
   </displayList>
+  <scriptData genuitypej7spz="2" gencodej7spz="1"/>
 </component>

fl-fgui-project/assets/Mount/UpgradeAttrListItem.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="626,70">
+  <displayList>
+    <text id="n0_ec0l" name="LvLabel" xy="3,1" pivot="0,0.5" size="90,34" fontSize="24" color="#fefefe" vAlign="middle" leading="0" text="等级：1"/>
+    <text id="n1_ec0l" name="AttrDescLabel" xy="3,34" pivot="0,0.5" size="227,34" fontSize="24" color="#fefefe" vAlign="middle" leading="0" text="属性加成描述+999%"/>
+    <image id="n2_ec0l" name="n2" src="j7spp" fileName="Images/shengji.png" xy="311,39" pivot="0.5,0.5" anchor="true"/>
+    <text id="n3_ec0l" name="NextLvLabel" xy="395,1" pivot="0,0.5" size="90,34" fontSize="24" color="#1ef369" vAlign="middle" leading="0" text="等级：1"/>
+    <text id="n4_ec0l" name="NextAttrDescLabel" xy="395,34" pivot="0,0.5" size="227,34" fontSize="24" color="#fefefe" vAlign="middle" leading="0" ubb="true" text="属性加成描述[color=#1EF369]+999%[/color]"/>
+  </displayList>
+  <scriptData genuitypeec0l11="2" gencodeec0l11="1"/>
+</component>

fl-fgui-project/assets/Mount/UpgradePreviewPanel.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="756,1344" designImage="ui://s58m5vbw9sqt3">
+  <displayList>
+    <component id="n0_ec0l" 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="n1_ec0l" name="n1" src="sfx630" fileName="Components/PopWin/PopWin.xml" pkg="gt6q23qw" xy="377,625" pivot="0.5,0.5" anchor="true" size="729,485" group="n16_ec0l">
+      <Label title="升级预览"/>
+    </component>
+    <image id="n2_ec0l" name="n2" src="hflb3x" fileName="images/kuang02.png" pkg="gt6q23qw" xy="378,553" pivot="0.5,0.5" anchor="true" size="624,162" group="n7_ec0l" alpha="0.5"/>
+    <image id="n3_ec0l" name="n3" src="j7spy" fileName="Images/fengexian.png" xy="378,520" pivot="0.5,0.5" anchor="true" size="560,5" group="n7_ec0l"/>
+    <text id="n4_ec0l" name="n4" xy="378,496" pivot="0.5,0.5" anchor="true" size="108,36" group="n7_ec0l" fontSize="26" color="#6187ca" align="center" vAlign="middle" leading="0" text="当前效果"/>
+    <text id="n5_ec0l" name="SkillNameLabel" xy="90,544" pivot="0,0.5" anchor="true" size="108,36" group="n7_ec0l" fontSize="26" color="#424450" vAlign="middle" leading="0" text="技能名称"/>
+    <text id="n6_ec0l" name="SkillDescLabel" xy="90,565" size="575,60" group="n7_ec0l" fontSize="20" color="#58608f" leading="4" autoSize="none" text="技能描述:-二三四五六七八九十一三三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十四五六"/>
+    <group id="n7_ec0l" name="n7" xy="66,472" size="624,162" group="n16_ec0l"/>
+    <image id="n8_ec0l" name="n8" src="hflb3x" fileName="images/kuang02.png" pkg="gt6q23qw" xy="378,730" pivot="0.5,0.5" anchor="true" size="624,162" group="n13_ec0l" alpha="0.5"/>
+    <image id="n9_ec0l" name="n9" src="j7spy" fileName="Images/fengexian.png" xy="378,697" pivot="0.5,0.5" anchor="true" size="560,5" group="n13_ec0l"/>
+    <component id="n14_ec0l" name="UnLockStar" src="j7spt" fileName="Components/MountStar.xml" xy="365,672" pivot="0.5,0.5" anchor="true" group="n13_ec0l"/>
+    <text id="n11_ec0l" name="NextSkillNameLabel" xy="90,720" pivot="0,0.5" anchor="true" size="108,36" group="n13_ec0l" fontSize="26" color="#424450" vAlign="middle" leading="0" text="技能名称"/>
+    <text id="n12_ec0l" name="NextSkillDescLabel" xy="90,742" size="575,60" group="n13_ec0l" fontSize="20" color="#58608f" leading="4" autoSize="none" text="技能描述:-二三四五六七八九十一三三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十四五六"/>
+    <text id="n15_ec0l" name="n15" xy="475,672" pivot="0.5,0.5" anchor="true" size="56,36" group="n13_ec0l" fontSize="26" color="#6187ca" align="center" vAlign="middle" leading="0" text="解锁"/>
+    <group id="n13_ec0l" name="n13" xy="66,649" size="624,162" group="n16_ec0l"/>
+    <group id="n16_ec0l" name="n16" xy="13,383" size="729,485" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+  </displayList>
+  <scriptData genuilayerec0l12="3" gencodeec0l12="1"/>
+</component>

fl-fgui-project/assets/Mount/UpgradeSuccessfulPanel.xml

@@ -4,7 +4,18 @@
     <component id="n1_f8ih" 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>
-    <image id="n0_f8ih" name="n0" src="tli0l" fileName="Bg/bg.png" pkg="gt6q23qw" xy="378,748" pivot="0.5,0.5" anchor="true"/>
-    <text id="n2_f8ih" name="n2" xy="378,434" pivot="0.5,0.5" anchor="true" size="196,64" fontSize="48" color="#ffffff" leading="0" strokeColor="#000000" strokeSize="2" text="升级成功"/>
+    <component id="n3_ec0l" name="n3" src="f8ih55" fileName="Components/PopWin/PopWin6.xml" pkg="gt6q23qw" xy="0,384" group="n11_ec0l"/>
+    <list id="n10_ec0l" name="AttrList" xy="66,542" size="626,280" group="n11_ec0l" overflow="scroll" lineGap="13" defaultItem="ui://s58m5vbwec0l11" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n11_ec0l" name="n11" xy="0,384" size="756,466" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <text id="n12_ec0l" name="n12" xy="378,1168" pivot="0.5,0.5" anchor="true" size="212,36" fontSize="26" color="#fefefe" align="center" vAlign="middle" leading="0" italic="true" text="点击任意位置关闭">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </text>
   </displayList>
+  <scriptData genuilayerf8ih10="3" gencodef8ih10="1"/>
 </component>

fl-fgui-project/assets/Mount/package.xml

@@ -18,7 +18,7 @@
     <image id="9sqte" name="shengjicailiao02.png" path="/Images/"/>
     <image id="9sqtf" name="xuanzhongkuang.png" path="/Images/"/>
     <image id="9sqtg" name="zuoqi.png" path="/NoExport/"/>
-    <component id="j7sph" name="DevelopPanel.xml" path="/"/>
+    <component id="j7sph" name="DevelopPanel.xml" path="/" exported="true"/>
     <image id="j7spi" name="banner01.png" path="/Bg/"/>
     <image id="j7spj" name="banner02.png" path="/Bg/"/>
     <image id="j7spk" name="jindutiao1.png" path="/Images/"/>
@@ -27,17 +27,19 @@
     <image id="j7spn" name="jiantou.png" path="/Images/"/>
     <component id="j7spo" name="ArrowBtn.xml" path="/Components/"/>
     <image id="j7spp" name="shengji.png" path="/Images/"/>
-    <component id="j7spq" name="AttrItemList.xml" path="/"/>
+    <component id="j7spq" name="AttrItemList.xml" path="/" exported="true"/>
     <image id="j7spr" name="star1.png" path="/Images/"/>
     <component id="j7sps" name="StarBar.xml" path="/Components/"/>
     <component id="j7spt" name="MountStar.xml" path="/Components/"/>
-    <component id="j7spu" name="TrainingAreaNested.xml" path="/"/>
+    <component id="j7spu" name="TrainingAreaNested.xml" path="/" exported="true"/>
     <component id="j7spv" name="EffectComponent.xml" path="/Components/"/>
     <image id="j7spw" name="shengjiyulan.png" path="/Images/"/>
     <component id="j7spx" name="UpgradePreviewBtn.xml" path="/Components/"/>
     <image id="j7spy" name="fengexian.png" path="/Images/" scale="9grid" scale9grid="32,0,6,5"/>
-    <component id="j7spz" name="MountListItem.xml" path="/"/>
-    <component id="f8ih10" name="UpgradeSuccessfulPanel.xml" path="/"/>
+    <component id="j7spz" name="MountListItem.xml" path="/" exported="true"/>
+    <component id="f8ih10" name="UpgradeSuccessfulPanel.xml" path="/" exported="true"/>
+    <component id="ec0l11" name="UpgradeAttrListItem.xml" path="/" exported="true"/>
+    <component id="ec0l12" name="UpgradePreviewPanel.xml" path="/"/>
   </resources>
   <publish name=""/>
 </packageDescription>