圣兵

Assets/AssetConfigs/Addressable/CustomSearch.txt

@@ -1,4 +1,4 @@
-568
+574
 Assets/Res/Addressable/Tables/achieveRewardTable.bytes
 Assets/Res/Addressable/Fonts/ALIMAMA_SDF.asset
 Assets/Res/Addressable/Fonts/ALIMAMA_SDF_outline.mat
@@ -307,6 +307,7 @@ Assets/Res/Addressable/Map/monster_1001101.prefab
 Assets/Res/Addressable/Map/monster_1001102.prefab
 Assets/Res/Addressable/UI/Prefabs/MainMap/MonsterBattleInfo.prefab
 Assets/Res/Addressable/Tables/MonsterTable.bytes
+Assets/Res/Addressable/FGUI/Mount/Mount_fui.bytes
 Assets/Res/Addressable/Map/Partners/partner_20111.prefab
 Assets/Res/Addressable/Map/Partners/partner_20121.prefab
 Assets/Res/Addressable/Map/Partners/partner_20131.prefab
@@ -478,6 +479,11 @@ Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_2.png
 Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_3.png
 Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_4.png
 Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_5.png
+Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_1.png
+Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_2.png
+Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_3.png
+Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_4.png
+Assets/Res/Addressable/UI/Atlas/Partner/sb_elementTypeRhombus_5.png
 Assets/Res/Addressable/UI/Atlas/Partner/sb_emptydi.png
 Assets/Res/Addressable/UI/Atlas/Partner/sb_pzdi_1.png
 Assets/Res/Addressable/UI/Atlas/Partner/sb_pzdi_2.png

Assets/AssetConfigs/Addressable/ProductAssetManifest.asset

@@ -1245,6 +1245,10 @@ MonoBehaviour:
     addressableName: monstertable
     assetGUID: a8d28a3bbd6a9894b8bad1e0f9c1bb06
     relativePath: 
+  - addressableId: 3081535030
+    addressableName: mount_fui
+    assetGUID: a23db4976f0259245a8bd8defc9ad821
+    relativePath: 
   - addressableId: 2987780988
     addressableName: partner_20111
     assetGUID: f79e6794c6ec37d4087ed7ed9a6cdf33
@@ -1929,6 +1933,26 @@ MonoBehaviour:
     addressableName: sb_elementtype_5
     assetGUID: 3d81a37a927ceb04aa80d928f9794d14
     relativePath: 
+  - addressableId: 632347169
+    addressableName: sb_elementtyperhombus_1
+    assetGUID: 38bd5d155c21afd4bbee617ea6208ddb
+    relativePath: 
+  - addressableId: 3460128661
+    addressableName: sb_elementtyperhombus_2
+    assetGUID: 3e878dc428d246e48bd7d8be197aa2e8
+    relativePath: 
+  - addressableId: 4044657744
+    addressableName: sb_elementtyperhombus_3
+    assetGUID: c3d88cc7d2d509a49811adbc4a9525c4
+    relativePath: 
+  - addressableId: 1949238968
+    addressableName: sb_elementtyperhombus_4
+    assetGUID: 8f7abf694540f0f498e46043d1d151be
+    relativePath: 
+  - addressableId: 92167284
+    addressableName: sb_elementtyperhombus_5
+    assetGUID: f3b6079e6d23d5e4b99bd35b91a1d532
+    relativePath: 
   - addressableId: 4132046259
     addressableName: sb_emptydi
     assetGUID: ffaafecec25f9d44da7a38472722357e

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DHJN4S/5Un5BBb0JfdC9O4GzU5UalCQu6cXoxgQ9cwFACIMXVSfz49A=
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DC8XsiL5AH8HdV0UPTBznHXxe398MQ0MiSQHqfyGHRqXNYjev34TzP8=
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XHlLvSL+AHzTJibZIqMfKJTYLm70mGZDOPyD2DT0q9kwNlU5lQnSpxI=
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: BywY5Hj7VXJ8UGWg0ChCIqRTrjLK0ZFeYtYUV/05IqeVjwtSVOQD57M=
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WXlNsyqqWi4Sdk3BlXRO5iU9oFZGG5BOCAQQ9G7bqgsja8KdPmTBeWk=
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/Data/Partners/PartnersData.cs

@@ -1,7 +1,6 @@
 
 using System;
 using System.Collections.Generic;
-using FL.Network;
 using UnityEngine;
 using XGame;
 using XGame.Database;

Assets/Scripts/Business/Runtime/Data/Partners/PartnersService.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Security.Cryptography;
 using FL.Network;
 using UnityEngine;
 using XGame;

Assets/Scripts/Business/Runtime/Define/AddressableDefine.Partner.cs

@@ -47,6 +47,15 @@ namespace FL
         {
             return $"sb_elementType_{type}";
         }
+        /// <summary>
+        /// 新属性类型图标（菱形）
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public static string SbElementTypeRhombus(int type)
+        {
+            return $"sb_elementTypeRhombus_{type}";
+        }
 
         /// <summary>
         /// 新圣兵类型图标

Assets/Scripts/Business/Runtime/Event/EventDefine.cs

@@ -278,6 +278,5 @@
         /// </summary>
         EpigraphChangeSelect,
         #endregion
-
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Partner/SbBagListItem/PartnerSbBagListItemCtrl.cs

@@ -5,6 +5,7 @@
 /// created by cb 2024
 
 using FairyGUI;
+using FL.Data;
 using XGame;
 using XGame.Database;
 using XGame.Framework.UI;
@@ -21,33 +22,43 @@ namespace FL.FGUI
         {
             AddUIListenres();
         }
+
         protected override void OnDisable()
         {
             RemoveUIListenres();
         }
+
         #region UI事件
         private void AddUIListenres()
         {
-
+            VM.PanelEvent.Add(OnClickBagItem);
         }
+
         private void RemoveUIListenres()
         {
-
+            VM.PanelEvent.Remove(OnClickBagItem);
         }
 
+        private void OnClickBagItem()
+        {
+            Context.UI.OpenAsync(UIKeys.PartnerSbStrengthPanel, _id);
+        }
         #endregion
         private int _id;
-        public void OnRefresh(int index, int sbId)
-        {
-            _id = sbId;
-            var table = PartnerTableRepo.Get(sbId);
-            if (table == null)
-            {
-                Log.Error($"圣兵表不存在，id:{_id}");
-                return;
-            }
-            VM.NameLabel.text = table.Name;
-            VM.SbItem.Ctrl.ShowUI(_id);
+
+        public void OnRefresh(int index, int sbId)
+        {
+            _id = sbId;
+            var table = PartnerTableRepo.Get(sbId);
+            if (table == null)
+            {
+                Log.Error($"圣兵表不存在，id:{_id}");
+                return;
+            }
+            VM.NameLabel.text = table.Name;
+            VM.SbItem.Ctrl.ShowUI(_id);
+            var pos = PartnersData.Instance.GetPartnerUpPosById(_id);
+            VM.IsUP.selectedIndex = pos < 0 ? 0 : 1;
         }
     }
-}
+}

Assets/Scripts/Business/Runtime/FGUI/Partner/SbBagPanel/PartnerSbBagPanelCtrl.cs

@@ -30,14 +30,15 @@ namespace FL.FGUI
     {
         protected override void OnEnable(object intent)
         {
-            AddUIListenres();
+            AddUIListenres();
+            InitView();
+            VM.OpenSelect.selectedIndex = 1;
+            ShowUI();
         }
 
         protected override void OnDisable()
         {
             RemoveUIListenres();
-            InitView();
-            ShowUI();
         }
 
         #region UI事件
@@ -55,7 +56,9 @@ namespace FL.FGUI
 
         private void OnClickOnStrongBtn(EventContext context) { }
 
-        private void OnClickSortBtn(EventContext context) { }
+        private void OnClickSortBtn(EventContext context) {
+            VM.OpenSelect.selectedIndex = VM.OpenSelect.selectedIndex > 0 ? 0 : 1;
+        }
 
         #endregion
         private List<PartnerSbBagListParam> _dataList = new List<PartnerSbBagListParam>();
@@ -67,65 +70,70 @@ namespace FL.FGUI
                 return;
             _init = true;
             VM.List.ListType = EGListType.Virtual;
-            VM.List.itemProvider = (index) =>
-            {
-                var data = _dataList[index];
-                if (data.Type == 0)
-                {
-                    return "ui://Partner/SbBagListTitleItem";
-                }
-                else
-                {
-                    return "ui://Partner/SbBagListLineItem";
-                }
-            };
+            //VM.List.itemProvider = (index) =>
+            //{
+            //    var data = _dataList[index];
+            //    if (data.Type == 0)
+            //    {
+            //        return "ui://Partner/SbBagListTitleItem";
+            //    }
+            //    else
+            //    {
+            //        return "ui://Partner/SbBagListLineItem";
+            //    }
+            //};
         }
 
         private void ShowUI()
         {
             var allSbList = PartnerTableRepo.GetAll();
-            var haveList = new List<int>();
-            var noHaveList = new List<int>();
-            foreach (var sb in allSbList)
-            {
-                var attr = PartnersData.Instance.GetPartnerAttrByTableId(sb.Id);
-                if (attr != null)
-                {
-                    haveList.Add(sb.Id);
-                }
-                else
-                {
-                    noHaveList.Add(sb.Id);
-                }
-            }
-            _dataList.Clear();
-            _dataList.Add(new PartnerSbBagListParam() { Type = 0, Title = StringDefine.Have });
-            var list = new List<int>();
-            foreach (var have in haveList)
-            {
-                list.Add(have);
-                if (list.Count >= 5)
-                {
-                    _dataList.Add(new PartnerSbBagListParam() { Type = 1, SbList = list });
-                    list = new List<int>();
-                }
-            }
-            if (list.Count > 0)
-            {
-                _dataList.Add(new PartnerSbBagListParam() { Type = 1, SbList = list });
-                list = new List<int>();
-            }
-            _dataList.Add(new PartnerSbBagListParam() { Type = 0, Title = StringDefine.NoHave });
-            foreach (var noHave in noHaveList)
+            //var haveList = new List<int>();
+            //var noHaveList = new List<int>();
+            //foreach (var sb in allSbList)
+            //{
+            //    var attr = PartnersData.Instance.GetPartnerAttrByTableId(sb.Id);
+            //    if (attr != null)
+            //    {
+            //        haveList.Add(sb.Id);
+            //    }
+            //    else
+            //    {
+            //        noHaveList.Add(sb.Id);
+            //    }
+            //}
+            //_dataList.Clear();
+            //_dataList.Add(new PartnerSbBagListParam() { Type = 0, Title = StringDefine.Have });
+            //var list = new List<int>();
+            //foreach (var have in haveList)
+            //{
+            //    list.Add(have);
+            //    if (list.Count >= 5)
+            //    {
+            //        _dataList.Add(new PartnerSbBagListParam() { Type = 1, SbList = list });
+            //        list = new List<int>();
+            //    }
+            //}
+            //if (list.Count > 0)
+            //{
+            //    _dataList.Add(new PartnerSbBagListParam() { Type = 1, SbList = list });
+            //    list = new List<int>();
+            //}
+            //_dataList.Add(new PartnerSbBagListParam() { Type = 0, Title = StringDefine.NoHave });
+            //foreach (var noHave in noHaveList)
+            //{
+            //    list.Add(noHave);
+            //    if (list.Count >= 5)
+            //    {
+            //        _dataList.Add(new PartnerSbBagListParam() { Type = 1, SbList = list });
+            //        list = new List<int>();
+            //    }
+            //}
+            var dataList = new List<int>();
+            foreach (var item in allSbList)
             {
-                list.Add(noHave);
-                if (list.Count >= 5)
-                {
-                    _dataList.Add(new PartnerSbBagListParam() { Type = 1, SbList = list });
-                    list = new List<int>();
-                }
+                dataList.Add(item.Id);
             }
-            VM.List.BindDatas(_dataList);
+            VM.List.BindDatas(dataList);
         }
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Partner/SbBagPanel/PartnerSbBagPanelVM.Gen.cs

@@ -33,6 +33,7 @@ namespace FL.FGUI
             CurSelect = panel.GetController("CurSelect");
             OpenSelect = panel.GetController("OpenSelect");
             List = panel.GetChild("List") as GList;
+            List.Init(typeof(PartnerSbBagListItemView), adapter.CreateListItem);
             OnStrongBtn = panel.GetChild("OnStrongBtn") as GButton;
             ShangZhenBtn = panel.GetChild("ShangZhenBtn") as GButton;
             PinZhiBtn = panel.GetChild("PinZhiBtn") as GButton;

Assets/Scripts/Business/Runtime/FGUI/Partner/SbBaseItem/PartnerSbBaseItemCtrl.cs

@@ -54,7 +54,7 @@ namespace FL.FGUI
                 return;
             }
             VM.PartnerImg.visible = true;
-            VM.ElementLoader.url = AddressableDefine.SbElementType((int)table.Element);
+            VM.ElementLoader.url = AddressableDefine.SbElementTypeRhombus((int)table.Element);
             VM.QualityImg.icon = AddressableDefine.SbPzDi((int)table.Quality);
             VM.PartnerImg.icon = table.Icon;
             VM.ShowOther.selectedIndex = showOther ? 0 : 1;
@@ -67,14 +67,7 @@ namespace FL.FGUI
                 if (showOther)
                 {
                     var starLv = partnerData?.RisingStarLv == null ? 1 : partnerData.RisingStarLv;
-                    var curNum = PartnersService.Instance.GetStarLv(starLv);
-                    var curStep = PartnersService.Instance.GetStarStep(starLv);
-                    var list = new List<int>();
-                    for (int i = 0; i < curNum; i++)
-                    {
-                        list.Add(curStep);
-                    }
-                    VM.StarList.BindDatas(list);
+                    ShowStar(starLv);
                     var starTable = partnerStarUpTableRepo.GetPartnerStarTable(sbId, starLv);
                     if (starTable == null)
                     {
@@ -86,5 +79,16 @@ namespace FL.FGUI
                 }
             }
         }
+        private void ShowStar(int starLv)
+        {
+            var curNum = PartnersService.Instance.GetStarLv(starLv);
+            var curStep = PartnersService.Instance.GetStarStep(starLv);
+            var list = new List<int>();
+            for (int i = 0; i < curNum; i++)
+            {
+                list.Add(curStep);
+            }
+            VM.StarList.BindDatas(list);
+        }
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Partner/SbDetailNested/PartnerSbDetailNestedCtrl.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using FairyGUI;
 using FL.Data;
+using FL.Data.Items;
 using XGame;
 using XGame.Database;
 using XGame.Framework.Database;
@@ -36,12 +37,12 @@ namespace FL.FGUI
         private void RemoveUIListenres() { }
 
         #endregion
-        private int _id;
+        private int _sbId;
 
         public void ShowUI(int id)
         {
-            _id = id;
-            if (_id == 0)
+            _sbId = id;
+            if (_sbId == 0)
             {
                 VM.IsEmpty.selectedIndex = 1;
                 return;
@@ -50,25 +51,43 @@ namespace FL.FGUI
             {
                 VM.IsEmpty.selectedIndex = 0;
             }
-            var table = PartnerTableRepo.Get(_id);
+            var table = PartnerTableRepo.Get(_sbId);
             if (table == null)
             {
-                Log.Error($"圣兵表不存在,id:{_id}");
+                Log.Error($"圣兵表不存在,id:{_sbId}");
                 return;
             }
-            var attr = PartnersData.Instance.GetPartnerAttrByTableId(_id);
+            VM.NameLabel.text = table.Name;
+            var attr = PartnersData.Instance.GetPartnerAttrByTableId(_sbId);
             var level = attr?.Level ?? 1;
             var star = attr?.RisingStarLv ?? 1;
-            var upLevelTable = partnerStarUpTableRepo.GetPartnerStarTable(_id, star);
+            var upLevelTable = partnerStarUpTableRepo.GetPartnerStarTable(_sbId, star);
             if (upLevelTable == null)
             {
-                Log.Error($"圣兵升星表不存在,id:{_id},level:{level}");
+                Log.Error($"圣兵升星表不存在,id:{_sbId},level:{level}");
                 return;
             }
             //
             VM.SpPbar.max = upLevelTable.StarUpCost;
             VM.SpPbar.value = ItemData.Instance.GetItemNum(upLevelTable.PetId);
             //
+            ShowStar(star);
+            //
+            ShowSkillBaseInfo(table.Skill[0]);
+            //
+            ShowAttr(level);
+            //
+            VM.ElementLoader.url = AddressableDefine.SbElementType(((int)table.Element));
+            VM.TypeLoader.url = AddressableDefine.SbTypeIcon(table.Type);
+            //
+            VM.AttrLabel.text = $"+{table.Own_attr[1]/100f}%";
+            var item = new Item();
+            //item.Init(table, table.Id);
+            //VM.ItemBase.Ctrl.ShowUI()
+        }
+
+        private void ShowStar(int star)
+        {
             var starStep = PartnersService.Instance.GetStarStep(star);
             var starLv = PartnersService.Instance.GetStarLv(star);
             var list = new List<int>();
@@ -77,14 +96,14 @@ namespace FL.FGUI
                 list.Add(starStep);
             }
             VM.StarList.BindDatas(list);
-            //
-            VM.NameLabel.text = table.Name;
-            ShowSkillBaseInfo(table.Skill[0]);
-            //
-            var lvTable = partnerLvUpTableRepo.GetPartnerLvUpTable(_id, level);
+        }
+
+        private void ShowAttr(int level)
+        {
+            var lvTable = partnerLvUpTableRepo.GetPartnerLvUpTable(_sbId, level);
             if (lvTable == null)
             {
-                Log.Error($"圣兵等级不存在，id:{_id},level:{level}");
+                Log.Error($"圣兵等级不存在，id:{_sbId},level:{level}");
                 return;
             }
             var atkVal = lvTable.LvAttr[1];
@@ -96,8 +115,6 @@ namespace FL.FGUI
                 atkSpeed > 0 ? TableUtils.ToRealDouble(atkSpeed).ToString("F1") : "0";
             VM.SpeedValLabel.text = descSpeed;
             //VM.ItemBase.Ctrl.ShowUI()
-            VM.ElementLoader.url = AddressableDefine.SbElementType(((int)table.Element));
-            VM.TypeLoader.url = AddressableDefine.SbTypeIcon(table.Type);
         }
 
         /// <summary>

Assets/Scripts/Business/Runtime/FGUI/Partner/SbDetailNested/PartnerSbDetailNestedVM.Gen.cs

@@ -22,7 +22,7 @@ namespace FL.FGUI
         public CommonItemBaseView ItemBase { get; private set; }
         public GTextField AtkValLabel { get; private set; }
         public GTextField SpeedValLabel { get; private set; }
-        public GTextField OwnerLabel { get; private set; }
+        public GTextField AttrLabel { get; private set; }
         public GTextField DescLabel { get; private set; }
         public GTextField NameLabel { get; private set; }
         public GList StarList { get; private set; }
@@ -38,7 +38,7 @@ namespace FL.FGUI
             AddChild(ItemBase);
             AtkValLabel = panel.GetChild("AtkValLabel") as GTextField;
             SpeedValLabel = panel.GetChild("SpeedValLabel") as GTextField;
-            OwnerLabel = panel.GetChild("OwnerLabel") as GTextField;
+            AttrLabel = panel.GetChild("AttrLabel") as GTextField;
             DescLabel = panel.GetChild("DescLabel") as GTextField;
             NameLabel = panel.GetChild("NameLabel") as GTextField;
             StarList = panel.GetChild("StarList") as GList;

Assets/Scripts/Business/Runtime/FGUI/Partner/SbDetailNoIconNested/PartnerSbDetailNoIconNestedCtrl.cs

@@ -50,9 +50,9 @@ namespace FL.FGUI
             }
             var attr = PartnersData.Instance.GetPartnerAttrByTableId(_sbId);
             var level = attr?.Level ?? 1;
-            var star = attr?.RisingStarLv ?? 1;
-
-            //
+            var star = attr?.RisingStarLv ?? 1;
+            VM.AttrLabel.text = $"+{table.Own_attr[1]/100f}%";
+            //
             ShowSkillBaseInfo(table.Skill[0]);
             //
             ShowAttr(level);
@@ -60,6 +60,9 @@ namespace FL.FGUI
             VM.ElementLoader.url = AddressableDefine.SbElementType(((int)table.Element));
             VM.TypeLoader.url = AddressableDefine.SbTypeIcon(table.Type);
             ShowBuff(star);
+            //
+            var pos = PartnersData.Instance.GetPartnerUpPosById(_sbId);
+            VM.IsUp.selectedIndex = pos < 0 ? 0 : 1;
         }
 
         private void ShowAttr(int level)

Assets/Scripts/Business/Runtime/FGUI/Partner/SbDetailNoIconNested/PartnerSbDetailNoIconNestedVM.Gen.cs

@@ -22,7 +22,7 @@ namespace FL.FGUI
         public Controller IsUp { get; private set; }
         public GTextField AtkValLabel { get; private set; }
         public GTextField SpeedValLabel { get; private set; }
-        public GTextField OwnerLabel { get; private set; }
+        public GTextField AttrLabel { get; private set; }
         public GTextField DescLabel { get; private set; }
         public GList SkillList { get; private set; }
         public GLoader ElementLoader { get; private set; }
@@ -34,7 +34,7 @@ namespace FL.FGUI
             IsUp = panel.GetController("IsUp");
             AtkValLabel = panel.GetChild("AtkValLabel") as GTextField;
             SpeedValLabel = panel.GetChild("SpeedValLabel") as GTextField;
-            OwnerLabel = panel.GetChild("OwnerLabel") as GTextField;
+            AttrLabel = panel.GetChild("AttrLabel") as GTextField;
             DescLabel = panel.GetChild("DescLabel") as GTextField;
             SkillList = panel.GetChild("SkillList") as GList;
             SkillList.Init(typeof(PartnerSbDetailSkillListItemView), adapter.CreateListItem);

Assets/Scripts/Business/Runtime/FGUI/Partner/SbStrengthPanel/PartnerSbStrengthPanelCtrl.cs

@@ -97,25 +97,40 @@ namespace FL.FGUI
             }
             VM.NameLabel.text = table.Name;
             var attr = PartnersData.Instance.GetPartnerAttrByTableId(table.Id);
-            VM.Have.selectedIndex = attr == null ? 1 : 0;
+            
+            if(attr == null)
+            {
+                VM.StarUpBtn.Disable();
+                VM.LevelUpBtn.Disable();
+                VM.Have.selectedIndex = 1;
+            }
+            else
+            {
+                VM.StarUpBtn.Enable(null);
+                VM.LevelUpBtn.Enable(null);
+                VM.Have.selectedIndex = 0;
+            }
             var level = attr == null ? 1 : attr.Level;
             var star = attr == null ? 1 : attr.RisingStarLv;
-            var curLv = PartnersService.Instance.GetStarLv(star);
-            var curStep = PartnersService.Instance.GetStarStep(star);
-            var list = new List<int>();
-            for (int i = 0; i < curStep; i++)
-            {
-                list.Add(curStep);
-            }
-            VM.StarList.BindDatas(list);
+            ShowStar(star);
             VM.LvLabel.text = $"Lv {level}";
             VM.DetailNested.Ctrl.ShowUI(_curSelectId);
             if (attr != null)
             {
                 ShowUpBtn(attr.TableId);
             }
+        }
+        private void ShowStar(int starLv)
+        {
+            var curNum = PartnersService.Instance.GetStarLv(starLv);
+            var curStep = PartnersService.Instance.GetStarStep(starLv);
+            var list = new List<int>();
+            for (int i = 0; i < curNum; i++)
+            {
+                list.Add(curStep);
+            }
+            VM.StarList.BindDatas(list);
         }
-
         private void ShowEpi()
         {
             var info = PartnersData.Instance.GetPartnerAttrByTableId(_curSelectId);

Assets/Scripts/Business/Runtime/FGUI/Partner/SbStrengthPanel/PartnerSbStrengthPanelVM.Gen.cs

@@ -25,10 +25,10 @@ namespace FL.FGUI
         public PartnerSbDetailNoIconNestedView DetailNested { get; private set; }
         public PartnerSbStarUpBtnView StarUpBtn { get; private set; }
         public PartnerSbLevelUpBtnView LevelUpBtn { get; private set; }
-        public GButton UpBtn { get; private set; }
         public GButton LeftBtn { get; private set; }
         public GButton RightBtn { get; private set; }
         public PartnerMwSetBtnView MwSet { get; private set; }
+        public GButton UpBtn { get; private set; }
         public GImage UpArrImg { get; private set; }
         public GList StarList { get; private set; }
 
@@ -44,11 +44,11 @@ namespace FL.FGUI
             AddChild(StarUpBtn);
             LevelUpBtn = adapter.CreateNested<PartnerSbLevelUpBtnView>(new FguiNested(panel.GetChild("LevelUpBtn").asCom), true);
             AddChild(LevelUpBtn);
-            UpBtn = panel.GetChild("UpBtn") as GButton;
             LeftBtn = panel.GetChild("LeftBtn") as GButton;
             RightBtn = panel.GetChild("RightBtn") as GButton;
             MwSet = adapter.CreateNested<PartnerMwSetBtnView>(new FguiNested(panel.GetChild("MwSet").asCom), true);
             AddChild(MwSet);
+            UpBtn = panel.GetChild("UpBtn") as GButton;
             UpArrImg = panel.GetChild("UpArrImg") as GImage;
             StarList = panel.GetChild("StarList") as GList;
             StarList.Init(typeof(PartnerSbStarListItemView), adapter.CreateListItem);

Assets/Scripts/Business/Runtime/FGUI/Partner/StarBuffItem/PartnerStarBuffItemCtrl.cs

@@ -12,7 +12,6 @@ using XGame.Framework.UI;
 
 namespace FL.FGUI
 {
-
     /// <summary>
     /// UI逻辑处理类
     /// </summary>

fl-fgui-project/assets/Partner/NewPartner/SbBagPanel.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="756,1344" designImage="ui://2981jnh7ifoa5i" designImageAlpha="0" designImageLayer="1">
+<component size="756,1344" scroll="horizontal" designImage="ui://2981jnh7ifoa5i" designImageAlpha="0" designImageLayer="1">
   <controller name="CurSelect" pages="0,,1,,2,,3," selected="0">
     <remark page="0" value="上阵"/>
     <remark page="1" value="品质"/>
@@ -17,14 +17,32 @@
     <image id="n36_q0v6" name="n36" src="q0v65u" fileName="NewPartner/img/titlebg1.png" xy="0,22" group="n87_q0v6"/>
     <text id="n38_q0v6" name="n1" xy="31,39" pivot="0.5,0.5" size="124,42" group="n87_q0v6" fontSize="30" color="#ffffff" strokeColor="#000000" strokeSize="2" text="圣兵列表"/>
     <group id="n87_q0v6" name="n87" xy="0,22" size="226,79"/>
-    <list id="n101_q0v6" name="List" xy="22,115" size="711,986" overflow="scroll" autoClearItems="true">
+    <list id="n101_q0v6" name="List" xy="22,115" size="711,986" layout="flow_hz" overflow="scroll" defaultItem="ui://2981jnh7q0v678" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
-      <item url="ui://2981jnh7lkie8j"/>
-      <item url="ui://2981jnh7q0v67b"/>
-      <item url="ui://2981jnh7q0v67b"/>
-      <item url="ui://2981jnh7lkie8j"/>
-      <item url="ui://2981jnh7q0v67b"/>
-      <item url="ui://2981jnh7q0v67b"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
     <component id="n102_q0v6" name="OnStrongBtn" src="q0v66n" fileName="NewPartner/components/Yellow2Btn.xml" xy="253,1115">
       <relation target="" sidePair="bottom-bottom"/>

fl-fgui-project/assets/Partner/NewPartner/SbMainPanel.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="756,1344" designImage="ui://2981jnh7q0v67q" designImageAlpha="25" designImageLayer="1">
+<component size="756,1344" designImage="ui://2981jnh7ifoa5f" designImageAlpha="100">
   <controller name="UpPartner" pages="0,,1," selected="0">
     <remark page="0" value="正常界面状态"/>
     <remark page="1" value="处于圣兵上阵选择状态"/>
@@ -15,19 +15,22 @@
     <text id="n38_q0v6" name="n2" xy="61,39" size="64,42" group="n87_q0v6" fontSize="30" color="#ffffff" strokeColor="#000000" strokeSize="2" text="圣兵"/>
     <group id="n87_q0v6" name="n87" xy="0,22" size="226,79"/>
     <image id="n34_q0v6" name="n34" src="q0v65t" fileName="NewPartner/img/titlebg2.png" xy="193,350" group="n86_q0v6"/>
-    <text id="n35_q0v6" name="AttrLabel" xy="238,355" pivot="0.5,0.5" size="285,32" group="n86_q0v6" fontSize="22" color="#ffffff" ubb="true" strokeColor="#000000" strokeSize="2" autoClearText="true" text="基础攻击&amp;防御&amp;生命+268%"/>
+    <text id="n35_q0v6" name="AttrLabel" xy="238,355" pivot="0.5,0.5" size="285,32" group="n86_q0v6" fontSize="22" color="#ffffff" ubb="true" vars="true" strokeColor="#000000" strokeSize="2" text="基础攻击&amp;防御&amp;生命[color=#1ef369]+{val=268}%[/color]"/>
     <group id="n86_q0v6" name="n86" xy="193,350" size="372,44" group="n88_q0v6"/>
     <image id="n54_q0v6" name="n54" src="q0v66r" fileName="NewPartner/img/banping1bg.png" xy="0,697" size="756,647" group="n88_q0v6">
       <relation target="" sidePair="bottomext-bottom"/>
     </image>
     <component id="n42_q0v6" name="SbDetailNested" src="q0v670" fileName="NewPartner/item/SbDetailNested.xml" xy="23,716" group="n88_q0v6"/>
-    <component id="n43_q0v6" name="ReplaceBtn" src="q0v66l" fileName="NewPartner/components/BlueBtn.xml" xy="151,1027" group="n88_q0v6">
+    <component id="n43_q0v6" name="ReplaceBtn" src="q0v66l" fileName="NewPartner/components/BlueBtn.xml" xy="151,1027" group="n99_en8u">
       <Button title="替换"/>
     </component>
-    <image id="n90_q0v6" name="CanUpImg" src="q0v672" fileName="NewPartner/img/Upgradable.png" xy="307,1020" group="n88_q0v6"/>
-    <component id="n47_q0v6" name="StrengthBtn" src="q0v66m" fileName="NewPartner/components/YellowBtn.xml" xy="441,1027" group="n88_q0v6">
+    <image id="n90_q0v6" name="CanUpImg" src="q0v672" fileName="NewPartner/img/Upgradable.png" xy="307,1020" group="n99_en8u" visible="false"/>
+    <component id="n47_q0v6" name="StrengthBtn" src="q0v66m" fileName="NewPartner/components/YellowBtn.xml" xy="441,1027" group="n99_en8u">
       <Button title="强化"/>
     </component>
+    <group id="n99_en8u" name="n99" xy="151,1020" size="462,63" group="n88_q0v6" advanced="true">
+      <gearDisplay controller="IsEmpty" pages="0"/>
+    </group>
     <component id="n48_q0v6" name="OneUpBtn" src="q0v66n" fileName="NewPartner/components/Yellow2Btn.xml" xy="254,1115" group="n88_q0v6">
       <Button title="一键上阵"/>
     </component>

fl-fgui-project/assets/Partner/NewPartner/SbStrengthPanel.xml

@@ -15,18 +15,18 @@
     <text id="n124_q0v6" name="NameLabel" xy="316,545" pivot="0.5,0.5" size="124,42" group="n133_jmnf" fontSize="30" color="#ffffff" align="center" strokeColor="#000000" strokeSize="2" autoClearText="true" text="霜之哀伤"/>
     <text id="n127_q0v6" name="LvLabel" xy="329,462" pivot="0.5,0.5" size="95,42" group="n133_jmnf" fontSize="30" color="#ffffff" align="center" strokeColor="#000000" strokeSize="2" text="Lv 999"/>
     <component id="n115_q0v6" name="DetailNested" src="q0v67u" fileName="NewPartner/item/SbDetailNoIconNested.xml" xy="21,597" group="n133_jmnf"/>
-    <component id="n128_q0v6" name="StarUpBtn" src="q0v67z" fileName="NewPartner/item/SbStarUpBtn.xml" xy="120,1112" group="n134_jmnf"/>
-    <component id="n116_q0v6" name="LevelUpBtn" src="q0v682" fileName="NewPartner/item/SbLevelUpBtn.xml" xy="390,1110" group="n134_jmnf"/>
-    <component id="n122_q0v6" name="UpBtn" src="q0v66p" fileName="NewPartner/components/DiaBtn.xml" xy="653,1114" group="n134_jmnf">
+    <component id="n128_q0v6" name="StarUpBtn" src="q0v67z" fileName="NewPartner/item/SbStarUpBtn.xml" xy="120,1112" group="n133_jmnf"/>
+    <component id="n116_q0v6" name="LevelUpBtn" src="q0v682" fileName="NewPartner/item/SbLevelUpBtn.xml" xy="390,1110" group="n133_jmnf"/>
+    <component id="n125_q0v6" name="LeftBtn" src="z7d1g" fileName="NewPartner/components/ArrowBtn.xml" xy="32,517" group="n133_jmnf"/>
+    <component id="n126_q0v6" name="RightBtn" src="z7d1g" fileName="NewPartner/components/ArrowBtn.xml" xy="624,517" group="n133_jmnf" scale="-1,1"/>
+    <component id="n129_scnr" name="MwSet" src="scnr85" fileName="NewEpigraph/item/MwSetBtn.xml" xy="615,416" group="n133_jmnf"/>
+    <component id="n122_q0v6" name="UpBtn" src="q0v66p" fileName="NewPartner/components/DiaBtn.xml" xy="653,1114" group="n135_en8u">
       <Button title="上阵" icon="ui://2981jnh7q0v67f"/>
     </component>
-    <group id="n134_jmnf" name="n134" xy="120,1110" size="617,83" group="n133_jmnf" advanced="true">
+    <image id="n131_uai3" name="UpArrImg" src="q0v672" fileName="NewPartner/img/Upgradable.png" xy="331,1108" group="n135_en8u" visible="false"/>
+    <group id="n135_en8u" name="n135" xy="331,1108" size="406,85" group="n133_jmnf" advanced="true">
       <gearDisplay controller="Have" pages="0"/>
     </group>
-    <component id="n125_q0v6" name="LeftBtn" src="z7d1g" fileName="NewPartner/components/ArrowBtn.xml" xy="32,517" group="n133_jmnf"/>
-    <component id="n126_q0v6" name="RightBtn" src="z7d1g" fileName="NewPartner/components/ArrowBtn.xml" xy="624,517" group="n133_jmnf" scale="-1,1"/>
-    <component id="n129_scnr" name="MwSet" src="scnr85" fileName="NewPartner/components/MwSetBtn.xml" xy="615,416" group="n133_jmnf"/>
-    <image id="n131_uai3" name="UpArrImg" src="q0v672" fileName="NewPartner/img/Upgradable.png" xy="331,1108" group="n133_jmnf"/>
     <list id="n132_jmnf" name="StarList" xy="289,506" size="200,34" group="n133_jmnf" scale="0.9,0.9" layout="row" colGap="-11" defaultItem="ui://2981jnh7q0v67w" autoItemSize="false" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <item/>
       <item/>

fl-fgui-project/assets/Partner/NewPartner/item/SbBaseItem.xml

@@ -13,14 +13,14 @@
     <text id="n13_vn6w" name="LevelTxt" xy="32,3" size="65,29" fontSize="20" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" text="Lv.102">
       <gearDisplay controller="Have" pages="0"/>
     </text>
-    <component id="n18_q0v6" name="SpPbar" src="q0v66j" fileName="NewPartner/components/SpProgress.xml" xy="18,28">
-      <gearDisplay controller="ShowOther" pages="0"/>
-      <gearDisplay2 controller="Have" pages="0" condition="0"/>
+    <component id="n18_q0v6" name="SpPbar" src="q0v66j" fileName="NewPartner/components/SpProgress.xml" xy="18,28" group="n22_lkie">
       <ProgressBar value="2" max="2"/>
     </component>
-    <image id="n19_q0v6" name="n19" src="q0v66g" fileName="NewPartner/img/suipian.png" xy="13,30">
+    <image id="n19_q0v6" name="n19" src="q0v66g" fileName="NewPartner/img/suipian.png" xy="13,30" group="n22_lkie"/>
+    <group id="n22_lkie" name="n22" xy="13,28" size="81,26" advanced="true">
       <gearDisplay controller="ShowOther" pages="0"/>
-    </image>
+      <gearDisplay2 controller="Have" pages="0" condition="0"/>
+    </group>
     <loader id="n20_q0v6" name="ElementLoader" xy="-8,-7" pivot="0.5,0.5" size="46,46" scale="0.7,0.7" url="ui://2981jnh7q0v66y" align="center" vAlign="middle" autoSize="true" clearOnPublish="true"/>
     <list id="n21_q0v6" name="StarList" xy="5,196" size="200,34" scale="0.5,0.5" layout="row" colGap="-8" defaultItem="ui://2981jnh7q0v67w" align="center" autoClearItems="true">
       <gearDisplay controller="ShowOther" pages="0"/>

fl-fgui-project/assets/Partner/NewPartner/item/SbDetailNested.xml

@@ -22,7 +22,7 @@
     <image id="n66_q0v6" name="n66" src="q0v66u" fileName="NewPartner/img/Textbg.png" xy="167,164" size="521,32" group="n71_q0v6"/>
     <image id="n67_q0v6" name="n67" src="q0v65q" fileName="NewPartner/img/jiahao.png" xy="168,166" group="n71_q0v6"/>
     <text id="n69_q0v6" name="n69" xy="194,164" size="212,32" group="n71_q0v6" fontSize="22" color="#ffffff" align="center" strokeColor="#000000" strokeSize="2" text="基础攻击&amp;防御&amp;生命"/>
-    <text id="n70_q0v6" name="OwnerLabel" xy="618,164" pivot="1,0" size="64,32" group="n71_q0v6" fontSize="22" color="#1ef369" align="center" strokeColor="#000000" strokeSize="2" autoClearText="true" text="+46%"/>
+    <text id="n70_q0v6" name="AttrLabel" xy="618,164" pivot="1,0" size="64,32" group="n71_q0v6" fontSize="22" color="#1ef369" align="center" strokeColor="#000000" strokeSize="2" autoClearText="true" text="+46%"/>
     <group id="n71_q0v6" name="n71" xy="167,164" size="521,32" group="n81_q0v6"/>
     <text id="n72_q0v6" name="DescLabel" xy="172,207" size="516,69" group="n81_q0v6" fontSize="22" color="#ffffff" leading="0" autoSize="none" strokeColor="#000000" strokeSize="2" autoClearText="true" text="释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个"/>
     <image id="n73_q0v6" name="n73" src="q0v66u" fileName="NewPartner/img/Textbg.png" xy="167,27" size="522,32" group="n82_q0v6"/>

fl-fgui-project/assets/Partner/NewPartner/item/SbDetailNoIconNested.xml

@@ -30,11 +30,11 @@
     <image id="n66_q0v6" name="n66" src="q0v66u" fileName="NewPartner/img/Textbg.png" xy="38,121" size="636,32" group="n71_q0v6"/>
     <image id="n67_q0v6" name="n67" src="q0v65q" fileName="NewPartner/img/jiahao.png" xy="46,123" group="n71_q0v6"/>
     <text id="n69_q0v6" name="n69" xy="73,121" size="212,32" group="n71_q0v6" fontSize="22" color="#ffffff" align="center" strokeColor="#000000" strokeSize="2" text="基础攻击&amp;防御&amp;生命"/>
-    <text id="n70_q0v6" name="OwnerLabel" xy="603,121" pivot="1,0" size="64,32" group="n71_q0v6" fontSize="22" color="#1ef369" align="center" strokeColor="#000000" strokeSize="2" autoClearText="true" text="+46%"/>
+    <text id="n70_q0v6" name="AttrLabel" xy="603,121" pivot="1,0" size="64,32" group="n71_q0v6" fontSize="22" color="#1ef369" align="center" strokeColor="#000000" strokeSize="2" autoClearText="true" text="+46%"/>
     <group id="n71_q0v6" name="n71" xy="38,121" size="636,32" group="n81_q0v6"/>
     <text id="n72_q0v6" name="DescLabel" xy="39,165" size="647,69" group="n81_q0v6" fontSize="22" color="#ffffff" leading="0" autoSize="none" strokeColor="#000000" strokeSize="2" autoClearText="true" text="释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个释放一个"/>
     <image id="n90_jmnf" name="n90" src="q0v66u" fileName="NewPartner/img/Textbg.png" xy="37,234" size="636,239" group="n89_jmnf"/>
-    <component id="n84_q0v6" name="n84" src="q0v67a" fileName="NewPartner/item/SbBagListTitleItem.xml" xy="1,241" group="n89_jmnf">
+    <component id="n84_q0v6" name="n84" src="q0v67a" fileName="NewPartner/components/SbBagTitle.xml" xy="1,241" group="n89_jmnf">
       <Label title="升星效果"/>
     </component>
     <list id="n85_q0v6" name="SkillList" xy="43,274" size="626,196" group="n89_jmnf" overflow="scroll" margin="10,0,0,0" lineGap="19" defaultItem="ui://2981jnh7q0v67y" autoClearItems="true">

fl-fgui-project/assets/Partner/NewPartner/item/SbItem.xml

@@ -7,9 +7,6 @@
   <displayList>
     <component id="n0_z6mw" name="PartnerBase" src="q0v66e" fileName="NewPartner/item/SbBaseItem.xml" xy="0,0"/>
     <component id="n1_z6mw" name="EpiSetBase" src="scnr84" fileName="NewEpigraph/item/MwSetBase.xml" xy="28,214" scale="0.7,0.7"/>
-    <image id="n2_cpp8" name="n2" src="v4ke28" fileName="Epigraph/Images/img/add.png" xy="31,79" aspect="true" scale="2.4,2.4">
-      <gearDisplay controller="IsEmpty" pages="1"/>
-    </image>
   </displayList>
   <scriptData genuitypez6mw3l="1" gencodez6mw3l="1" genuitypeq0v65x="1" gencodeq0v65x="1"/>
 </component>