zouweichen 1 viikko sitten
vanhempi
commit
475658ce4c
34 muutettua tiedostoa jossa 1567 lisäystä ja 44 poistoa
  1. BIN
      Assets/Res/Addressable/FGUI/Partner/Partner_fui.bytes
  2. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_1.png
  3. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_1.png.meta
  4. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_2.png
  5. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_2.png.meta
  6. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_3.png
  7. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_3.png.meta
  8. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_4.png
  9. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_4.png.meta
  10. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_5.png
  11. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_5.png.meta
  12. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_1.png
  13. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_1.png.meta
  14. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_2.png
  15. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_2.png.meta
  16. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_3.png
  17. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_3.png.meta
  18. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_4.png
  19. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_4.png.meta
  20. BIN
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_5.png
  21. 133 0
      Assets/Res/Addressable/UI/Atlas/Partner/sb_type_5.png.meta
  22. 12 0
      Assets/Scripts/Business/Runtime/Data/Partners/PartnersService.cs
  23. 23 4
      Assets/Scripts/Business/Runtime/Define/AddressableDefine.Partner.cs
  24. 88 7
      Assets/Scripts/Business/Runtime/FGUI/Partner/SbDetailNested/PartnerSbDetailNestedCtrl.cs
  25. 83 21
      Assets/Scripts/Business/Runtime/FGUI/Partner/SbMainPanel/PartnerSbMainPanelCtrl.cs
  26. 1 1
      Assets/Scripts/Business/Runtime/FGUI/Partner/SbRecommendPanel/PartnerSbRecommendPanelView.cs
  27. 2 0
      Assets/Scripts/Business/Runtime/FGUI/Partner/SbUpLineListItem/PartnerSbUpLineListItemVM.Gen.cs
  28. 10 1
      Assets/Scripts/Business/Runtime/FGUI/Partner/SbUpListItem/PartnerSbUpListItemView.ListItem.cs
  29. 1 0
      Assets/Scripts/Business/Runtime/FGUI/Partner/SbUpPanel/PartnerSbUpPanelVM.Gen.cs
  30. 8 2
      fl-fgui-project/assets/Partner/NewPartner/SbMainPanel.xml
  31. 1 1
      fl-fgui-project/assets/Partner/NewPartner/SbRecommendPanel.xml
  32. 4 4
      fl-fgui-project/assets/Partner/NewPartner/SbUpPanel.xml
  33. 2 2
      fl-fgui-project/assets/Partner/NewPartner/item/SbDetailNested.xml
  34. 2 1
      fl-fgui-project/assets/Partner/NewPartner/item/SbUpLineListItem.xml

BIN
Assets/Res/Addressable/FGUI/Partner/Partner_fui.bytes


BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_1.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_1.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: BnIZ4Sr+BS6uBEqz3qfKWBPm9rXqsl17/5BH4Wp2IlPE5QKFMc+ILy4=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_2.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CixNsi78AX+s3P99ThtYMjh5e+/BKChpkNuegoDWc2A0kmF+O7aNlQk=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_3.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_3.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WXtNsyqsAio+l+23lIlHmWs94a7gLEAvzCHC8uJa5Zlfeyl1rEFIeB4=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_4.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_4.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XX9O4S6lU3iMnOYYdZTfF3dTpoAZ2m1Tx3+OIOEcGYkgPfOmURVliPI=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_5.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_elementType_5.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DC4XtHuuVCpYDi8APv67Z1KCETz3oRV9afsGK9gUVEJVvSO5HlIIDRs=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_1.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_1.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DX5K4yulV3yC4p86zq2jXcjKoi59KDStYvBrScsRuNNcvx4S3DG/vM0=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_2.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Dn1K5nykU3yrRCsy7iVbCYHp3wgyU/BZ2G/ZrLr89OKdyIyLC94p3qk=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_3.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_3.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CCwfti3/AC7lfcOnNWRX/5NHH7FmzC3Uth2S6bX82m5aOpwQSvcZQkE=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_4.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_4.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CnJKtiOuBShcUHDco+7oOkgjyoXUR4J4vUT+fgJ8Z8SNzSDkCitUSJI=
+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: 

BIN
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_5.png


+ 133 - 0
Assets/Res/Addressable/UI/Atlas/Partner/sb_type_5.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: BngX4C2vVX3/NGKWWwhzy2kFLQ82p8AX/eV9SqqiBD+s3tBZw02WxxA=
+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: 

+ 12 - 0
Assets/Scripts/Business/Runtime/Data/Partners/PartnersService.cs

@@ -322,6 +322,18 @@ namespace FL.Data
             }
             return 1;
         }
+        /// <summary>
+        /// 获取升星当前级别星星等级
+        /// </summary>
+        /// <param name="starLv"></param>
+        /// <returns></returns>
+        public int GetStarLv(int starLv)
+        {
+            int starNum = starLv == 0 ? 0 : starLv % PartnersData.MaxStarNum;
+            if (starLv > 0 && starNum == 0)
+                starNum = PartnersData.MaxStarNum;
+            return starNum;
+        }
         #endregion
     }
 }

+ 23 - 4
Assets/Scripts/Business/Runtime/Define/AddressableDefine.Partner.cs

@@ -1,6 +1,4 @@
-
-
-using XGame.Database;
+using XGame.Database;
 
 namespace FL
 {
@@ -14,7 +12,7 @@ namespace FL
             return $"partner_pzdi_{qualityLv}";
         }
 
-        public static string PartnerStarIconName(int lv) 
+        public static string PartnerStarIconName(int lv)
         {
             return $"Partner_Star_{lv}";
         }
@@ -23,6 +21,7 @@ namespace FL
         {
             return $"partner_jindutiao_{quality}";
         }
+
         /// <summary>
         /// 获取圣兵的元素伤害类型
         /// </summary>
@@ -37,5 +36,25 @@ namespace FL
         {
             return "partner_emptydi";
         }
+
+        //新图标
+        /// <summary>
+        /// 新属性类型图标(方)
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public static string SbElementType(int type)
+        {
+            return $"sb_elementType_{type}";
+        }
+        /// <summary>
+        /// 新圣兵类型图标
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public static string SbTypeIcon(int type)
+        {
+            return $"sb_type_{type}";
+        }
     }
 }

+ 88 - 7
Assets/Scripts/Business/Runtime/FGUI/Partner/SbDetailNested/PartnerSbDetailNestedCtrl.cs

@@ -4,7 +4,12 @@
 /// 该脚本由模板创建
 /// created by cb 2024
 
+using System.Collections.Generic;
 using FairyGUI;
+using FL.Data;
+using XGame;
+using XGame.Database;
+using XGame.Framework.Database;
 using XGame.Framework.UI;
 
 namespace FL.FGUI
@@ -19,20 +24,96 @@ namespace FL.FGUI
         {
             AddUIListenres();
         }
+
         protected override void OnDisable()
         {
             RemoveUIListenres();
         }
+
         #region UI事件
-        private void AddUIListenres()
-        {
+        private void AddUIListenres() { }
 
-        }
-        private void RemoveUIListenres()
-        {
+        private void RemoveUIListenres() { }
 
+        #endregion
+        private int _id;
+
+        public void ShowUI(int id)
+        {
+            _id = id;
+            if (_id == 0)
+            {
+                VM.IsEmpty.selectedIndex = 1;
+                return;
+            }
+            else
+            {
+                VM.IsEmpty.selectedIndex = 0;
+            }
+            var table = PartnerTableRepo.Get(_id);
+            if (table == null)
+            {
+                Log.Error($"圣兵表不存在,id:{_id}");
+                return;
+            }
+            var attr = PartnersData.Instance.GetPartnerAttrByTableId(_id);
+            var level = attr?.Level ?? 1;
+            var star = attr?.RisingStarLv ?? 1;
+            var upLevelTable = partnerStarUpTableRepo.GetPartnerStarTable(_id, star);
+            if (upLevelTable == null)
+            {
+                Log.Error($"圣兵升星表不存在,id:{_id},level:{level}");
+                return;
+            }
+            //
+            VM.SpPbar.max = upLevelTable.StarUpCost;
+            VM.SpPbar.value = ItemData.Instance.GetItemNum(upLevelTable.PetId);
+            //
+            var starStep = PartnersService.Instance.GetStarStep(star);
+            var starLv = PartnersService.Instance.GetStarLv(star);
+            var list = new List<int>();
+            for (int i = 0; i < starLv; i++)
+            {
+                list.Add(starStep);
+            }
+            VM.StarList.BindDatas(list);
+            //
+            VM.NameLabel.text = table.Name;
+            ShowSkillBaseInfo(table.Skill[0]);
+            //
+            var lvTable = partnerLvUpTableRepo.GetPartnerLvUpTable(_id, level);
+            if (lvTable == null)
+            {
+                Log.Error($"圣兵等级不存在,id:{_id},level:{level}");
+                return;
+            }
+            var atkVal = lvTable.LvAttr[1];
+            //var attributeInfo = AttrDescTableRepo.Get(attrType);
+            string descAtk = atkVal > 0 ? TableUtils.ToRealDouble(atkVal).ToString("F1") : "0";
+            VM.AtkValLabel.text = descAtk;
+            var atkSpeed = lvTable.LvAttr[3];
+            string descSpeed =
+                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.ElementLoader.url = AddressableDefine.SbTypeIcon(table.Type);
         }
 
-        #endregion
+        /// <summary>
+        /// 基础技能描述
+        /// </summary>
+        /// <param name="skillId"></param>
+        private void ShowSkillBaseInfo(int skillId)
+        {
+            var skillInfo = SkillTableRepo.Get(skillId);
+            if (skillInfo == null)
+            {
+                Log.Error($"技能表不存在,id{skillId}");
+                return;
+            }
+            VM.DescLabel.text = skillInfo.Desc;
+        }
     }
-}
+}

+ 83 - 21
Assets/Scripts/Business/Runtime/FGUI/Partner/SbMainPanel/PartnerSbMainPanelCtrl.cs

@@ -4,7 +4,10 @@
 /// 该脚本由模板创建
 /// created by cb 2024
 
+using System.Collections.Generic;
 using FairyGUI;
+using FL.Data;
+using XGame;
 using XGame.Framework.UI;
 
 namespace FL.FGUI
@@ -18,11 +21,15 @@ namespace FL.FGUI
         protected override void OnEnable(object intent)
         {
             AddUIListenres();
+            InitView();
+            ShowUI();
         }
+
         protected override void OnDisable()
         {
             RemoveUIListenres();
         }
+
         #region UI事件
         private void AddUIListenres()
         {
@@ -34,8 +41,8 @@ namespace FL.FGUI
             VM.MaskBtn.onClick.Add(OnClickMaskBtn);
             VM.ConfirmBtn.onClick.Add(OnClickConfirmBtn);
             VM.CancelBtn.onClick.Add(OnClickCancelBtn);
-
         }
+
         private void RemoveUIListenres()
         {
             VM.ReplaceBtn.onClick.Remove(OnClickReplaceBtn);
@@ -46,33 +53,88 @@ namespace FL.FGUI
             VM.MaskBtn.onClick.Remove(OnClickMaskBtn);
             VM.ConfirmBtn.onClick.Remove(OnClickConfirmBtn);
             VM.CancelBtn.onClick.Remove(OnClickCancelBtn);
-
-        }
-        private void OnClickReplaceBtn(EventContext context)
-        {
         }
-        private void OnClickStrengthBtn(EventContext context)
-        {
-        }
-        private void OnClickOneUpBtn(EventContext context)
-        {
-        }
-        private void OnClickRecommendBtn(EventContext context)
-        {
-        }
-        private void OnClickBagBtn(EventContext context)
+
+        private void OnClickReplaceBtn(EventContext context) { }
+
+        private void OnClickStrengthBtn(EventContext context) { }
+
+        private void OnClickOneUpBtn(EventContext context) { }
+
+        private void OnClickRecommendBtn(EventContext context) { }
+
+        private void OnClickBagBtn(EventContext context) { }
+
+        private void OnClickMaskBtn(EventContext context) { }
+
+        private void OnClickConfirmBtn(EventContext context) { }
+
+        private void OnClickCancelBtn(EventContext context) { }
+
+        #endregion
+        #region 属性
+        private bool _initView = false;
+        private int _curSelectPos = 0;
+        #endregion
+        #region 页面
+        private void InitView()
         {
+            if (_initView)
+                return;
+            _initView = true;
+            VM.SbList.ListType = EGListType.None;
         }
-        private void OnClickMaskBtn(EventContext context)
+
+        private void ShowUI()
         {
+            RefreshGoneUpPartners(true);
+            UpdateDetail();
         }
-        private void OnClickConfirmBtn(EventContext context)
+
+        private void RefreshGoneUpPartners(bool chooseFirstSb)
         {
+            var plan = PartnersData.Instance.CurUsePlan;
+            if(plan == null)
+            {
+                Log.Error($"圣兵上阵方案不存在,id:{PartnersData.Instance.CurUsePlan}");
+                return;
+            }
+            if (chooseFirstSb)
+            {
+                _curSelectPos = 0;
+                for (int i = 0; i < PartnersData.GoneUpLimit; i++)
+                {
+                    var slot = plan.GetSlot(i);
+                    if (slot?.SbId > 0)
+                    {
+                        _curSelectPos = i;
+                        break;
+                    }
+                }
+            }
+            var list = new List<PartnerSbUpListItemParam>();
+            for (int i = 0; i < PartnersData.GoneUpLimit; i++)
+            {
+                var data = new PartnerSbUpListItemParam()
+                {
+                    PosId = i,
+                    CurSelectPos = _curSelectPos,
+                };
+                list.Add(data);
+            }
+            VM.SbList.BindDatas(list);
         }
-        private void OnClickCancelBtn(EventContext context)
-        {
+        private void UpdateDetail()
+        {
+            var plan = PartnersData.Instance.CurUsePlan;
+            if (plan == null)
+            {
+                Log.Error($"圣兵上阵方案不存在,id:{PartnersData.Instance.CurUsePlan}");
+                return;
+            }
+            var slot = plan.GetSlot(_curSelectPos);
+            VM.SbDetailNested.Ctrl.ShowUI(slot?.SbId ?? 0);
         }
-
         #endregion
     }
-}
+}

+ 1 - 1
Assets/Scripts/Business/Runtime/FGUI/Partner/SbRecommendPanel/PartnerSbRecommendPanelView.cs

@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class PartnerSbRecommendPanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.Middle;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new PartnerSbRecommendPanelCtrl());

+ 2 - 0
Assets/Scripts/Business/Runtime/FGUI/Partner/SbUpLineListItem/PartnerSbUpLineListItemVM.Gen.cs

@@ -20,12 +20,14 @@ namespace FL.FGUI
     {
         public PartnerSbDetailNestedView DetailNested { get; private set; }
         public GButton UpBtn { get; private set; }
+        public GImage UpArrImg { get; private set; }
 
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
         {
             DetailNested = adapter.CreateNested<PartnerSbDetailNestedView>(new FguiNested(panel.GetChild("DetailNested").asCom), true);
             AddChild(DetailNested);
             UpBtn = panel.GetChild("UpBtn") as GButton;
+            UpArrImg = panel.GetChild("UpArrImg") as GImage;
 
         }
     }

+ 10 - 1
Assets/Scripts/Business/Runtime/FGUI/Partner/SbUpListItem/PartnerSbUpListItemView.ListItem.cs

@@ -11,11 +11,20 @@ namespace FL.FGUI
     public partial class PartnerSbUpListItemView : IGListItemHandle
     {
         public int ItemIndex { get; private set; }
+
         void IGListItemHandle.OnRefresh(int index, object data)
         {
             ItemIndex = index;
             //Ctrl.OnRefresh(index, data as GListData);
-            throw new System.NotImplementedException("业务需要实现: PartnerSbUpListItemViewCtrl.OnRefresh()");
+            throw new System.NotImplementedException(
+                "业务需要实现: PartnerSbUpListItemViewCtrl.OnRefresh()"
+            );
         }
     }
+
+    public class PartnerSbUpListItemParam
+    {
+        public int PosId;
+        public int CurSelectPos;
+    }
 }

+ 1 - 0
Assets/Scripts/Business/Runtime/FGUI/Partner/SbUpPanel/PartnerSbUpPanelVM.Gen.cs

@@ -23,6 +23,7 @@ namespace FL.FGUI
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
         {
             List = panel.GetChild("List") as GList;
+            List.Init(typeof(PartnerSbUpLineListItemView), adapter.CreateListItem);
 
         }
     }

+ 8 - 2
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="43" designImageLayer="1">
+<component size="756,1344" designImage="ui://2981jnh7q0v67q" designImageAlpha="25" designImageLayer="1">
   <controller name="UpPartner" pages="0,,1," selected="0">
     <remark page="0" value="正常界面状态"/>
     <remark page="1" value="处于圣兵上阵选择状态"/>
@@ -36,7 +36,7 @@
       <Button title="圣兵列表" icon="ui://2981jnh7q0v66q"/>
     </component>
     <image id="n83_q0v6" name="DownArr" src="q0v66z" fileName="NewPartner/img/Stretch.png" xy="69,688" pivot="0.5,0.5" group="n88_q0v6" scale="1,-1">
-      <gearDisplay controller="IsEmpty" pages="0"/>
+      <gearDisplay controller="UpPartner" pages="0"/>
     </image>
     <image id="n84_q0v6" name="n84" src="q0v671" fileName="NewPartner/img/weikong.png" xy="235,847" group="n85_q0v6"/>
     <text id="n80_q0v6" name="n80" xy="337,870" size="158,59" group="n85_q0v6" fontSize="22" color="#ffffff" leading="0" strokeColor="#000000" strokeSize="2" text="还没有上阵圣兵&#xA;请一键上阵"/>
@@ -73,6 +73,12 @@
       <gearDisplay controller="UpPartner" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </image>
+    <image id="n95_uai3" name="n95" src="q0v676" fileName="NewPartner/img/Separation.png" xy="134,291" pivot="0.5,0.5" group="n98_uai3"/>
+    <image id="n96_uai3" name="n96" src="q0v676" fileName="NewPartner/img/Separation.png" xy="503,291" pivot="0.5,0.5" group="n98_uai3" scale="-1,1"/>
+    <text id="n97_uai3" name="n97" xy="326,283" pivot="0.5,0.5" size="100,34" group="n98_uai3" fontSize="24" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" text="选择替换"/>
+    <group id="n98_uai3" name="n98" xy="134,283" size="492,34" advanced="true">
+      <gearDisplay controller="UpPartner" pages="1"/>
+    </group>
   </displayList>
   <scriptData gencodevl6j0="1" gencodeq0v65j="1"/>
 </component>

+ 1 - 1
fl-fgui-project/assets/Partner/NewPartner/SbRecommendPanel.xml

@@ -36,5 +36,5 @@
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <scriptData genuilayeriqx986="4" gencodeiqx986="1"/>
+  <scriptData genuilayeriqx986="2" gencodeiqx986="1"/>
 </component>

+ 4 - 4
fl-fgui-project/assets/Partner/NewPartner/SbUpPanel.xml

@@ -7,11 +7,11 @@
     <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="21,142" size="714,1028" overflow="scroll" autoClearItems="true">
+    <list id="n101_q0v6" name="List" xy="21,142" size="714,1028" overflow="scroll" defaultItem="ui://2981jnh7q0v67n" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
-      <item url="ui://2981jnh7q0v67n"/>
-      <item url="ui://2981jnh7q0v67n"/>
-      <item url="ui://2981jnh7q0v67n"/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="714,394" designImage="ui://2981jnh7ifoa5f" designImageOffsetX="-22" designImageOffsetY="-716" designImageLayer="1">
+<component size="714,394" designImage="ui://2981jnh7ifoa5f" designImageOffsetX="-22" designImageOffsetY="-716" designImageAlpha="6" designImageLayer="1">
   <controller name="IsEmpty" pages="0,,1," selected="0">
     <remark page="0" value="不为空"/>
     <remark page="1" value="为空"/>
@@ -27,7 +27,7 @@
     <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"/>
     <text id="n75_q0v6" name="NameLabel" xy="171,25" size="108,36" group="n82_q0v6" fontSize="26" color="#ffffff" align="center" vAlign="middle" leading="0" strokeColor="#000000" strokeSize="2" autoClearText="true" text="霜之哀伤"/>
-    <list id="n84_q0v6" name="StarList" xy="483,26" size="200,34" group="n82_q0v6" layout="row" colGap="-13" defaultItem="ui://2981jnh7q0v67w" align="right" autoClearItems="true">
+    <list id="n84_q0v6" name="StarList" xy="483,26" size="200,34" group="n82_q0v6" layout="row" colGap="-13" defaultItem="ui://2981jnh7q0v67w" autoItemSize="false" align="right" autoClearItems="true" scrollItemToViewOnClick="false">
       <item/>
       <item/>
       <item/>

+ 2 - 1
fl-fgui-project/assets/Partner/NewPartner/item/SbUpLineListItem.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="714,406">
+<component size="714,406" designImage="ui://2981jnh7q0v67p" designImageOffsetX="-22" designImageOffsetY="-480" designImageLayer="1">
   <displayList>
     <component id="n110_q0v6" name="DetailNested" src="q0v670" fileName="NewPartner/item/SbDetailNested.xml" xy="0,6" size="714,394"/>
     <component id="n111_q0v6" name="UpBtn" src="q0v66l" fileName="NewPartner/components/BlueBtn.xml" xy="282,317">
       <Button title="上阵"/>
     </component>
+    <image id="n112_uai3" name="UpArrImg" src="q0v672" fileName="NewPartner/img/Upgradable.png" xy="118,29"/>
   </displayList>
   <scriptData genuitypeq0v67n="2" gencodeq0v67n="1"/>
 </component>