Ver código fonte

抽功法ui修改

lzx 1 dia atrás
pai
commit
cc78a61a27

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/mainUI.txt

@@ -1 +1 @@
-{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_fengling","filePath":"/decorate/dec_fengling.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_guajijiangli","filePath":"/decorate/dec_guajijiangli.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}
+{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_chouka_jinru","filePath":"/decorate/dec_chouka_jinru.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_fengling","filePath":"/decorate/dec_fengling.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_guajijiangli","filePath":"/decorate/dec_guajijiangli.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/shop.txt

@@ -1 +1 @@
-{"packName":"shop","isTyPack":false,"newTextureJson":[{"textrueName":"dec_10liandiban","filePath":"/decorate/dec_10liandiban.png"},{"textrueName":"dec_choudaijinquan_di","filePath":"/decorate/dec_choudaijinquan_di.png"},{"textrueName":"dec_danchou_diban","filePath":"/decorate/dec_danchou_diban.png"},{"textrueName":"dec_fengelan","filePath":"/decorate/dec_fengelan.png"},{"textrueName":"dec_shangpin_di","filePath":"/decorate/dec_shangpin_di.png"},{"textrueName":"dec_yeqian1","filePath":"/decorate/dec_yeqian1.png"},{"textrueName":"dec_yeqian2","filePath":"/decorate/dec_yeqian2.png"}],"keyToValue":{}}
+{"packName":"shop","isTyPack":false,"newTextureJson":[{"textrueName":"dec_10liandiban","filePath":"/decorate/dec_10liandiban.png"},{"textrueName":"dec_anniu_lingqu","filePath":"/decorate/dec_anniu_lingqu.png"},{"textrueName":"dec_anniu_lingqu_dan","filePath":"/decorate/dec_anniu_lingqu_dan.png"},{"textrueName":"dec_choudaijinquan_di","filePath":"/decorate/dec_choudaijinquan_di.png"},{"textrueName":"dec_danchou_diban","filePath":"/decorate/dec_danchou_diban.png"},{"textrueName":"dec_fengelan","filePath":"/decorate/dec_fengelan.png"},{"textrueName":"dec_lingqu_gg","filePath":"/decorate/dec_lingqu_gg.png"},{"textrueName":"dec_shangpin_di","filePath":"/decorate/dec_shangpin_di.png"},{"textrueName":"dec_yeqian1","filePath":"/decorate/dec_yeqian1.png"},{"textrueName":"dec_yeqian2","filePath":"/decorate/dec_yeqian2.png"}],"keyToValue":{}}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


BIN
Assets/Art/UIAssets/decorate/dec_anniu_lingqu_dan.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_anniu_lingqu_dan.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DH8YvXn+V3vKNLZ51KtocAfXcw0EHxYs9NtAmblMnLYb5EUupTWMy9bMUcB3
+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: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    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/Art/UIAssets/decorate/dec_chouka_jinru.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_chouka_jinru.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: C3NJ5yv5VSi6w5T17YSChl23bkCDF+WVu6S6zKjVRvpAYvgQBg0lqFP1yOzv
+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: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    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/Art/UIAssets/decorate/dec_jx_bt1_db.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_jx_bt1_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DH8WsXupWijj4kAEeGAU6CeNHtP1BdTR6FZ5dn/X9gq76Gcf97hEnFbLHsmc
+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: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    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: 

+ 44 - 14
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -427,8 +427,8 @@ MonoBehaviour:
     - gameObject: {fileID: 6301372275407792793}
     - gameObject: {fileID: 3514576898811181058}
     - gameObject: {fileID: 7676295276959900716}
-  - key: Text_Score
-    gameObject: {fileID: 30842790080791622}
+  - key: Text_ScoreCount
+    gameObject: {fileID: 4587905833105513312}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -442,8 +442,23 @@ MonoBehaviour:
     - gameObject: {fileID: 6301372275407792793}
     - gameObject: {fileID: 3514576898811181058}
     - gameObject: {fileID: 7676295276959900716}
-  - key: Text_ScoreCount
-    gameObject: {fileID: 4587905833105513312}
+  - key: Slider_Score1
+    gameObject: {fileID: 9192670011824124298}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8460248494035766006}
+    - gameObject: {fileID: 7583756930290804199}
+    - gameObject: {fileID: 8691601371041149407}
+    - gameObject: {fileID: 3161106526278752775}
+    - gameObject: {fileID: 983928321077698655}
+    - gameObject: {fileID: 4493318351616086192}
+    - gameObject: {fileID: 7833803437519831564}
+    - gameObject: {fileID: 6301372275407792793}
+    - gameObject: {fileID: 3514576898811181058}
+    - gameObject: {fileID: 7676295276959900716}
+  - key: Slider_Score2
+    gameObject: {fileID: 1476782049723506146}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -457,7 +472,7 @@ MonoBehaviour:
     - gameObject: {fileID: 6301372275407792793}
     - gameObject: {fileID: 3514576898811181058}
     - gameObject: {fileID: 7676295276959900716}
-  - key: ScoreName
+  - key: ScoreRoot
     gameObject: {fileID: 9144679203773037795}
     isAssetBundle: 0
     isList: 0
@@ -472,6 +487,21 @@ MonoBehaviour:
     - gameObject: {fileID: 6301372275407792793}
     - gameObject: {fileID: 3514576898811181058}
     - gameObject: {fileID: 7676295276959900716}
+  - key: Text_ScoreName
+    gameObject: {fileID: 30842790080791622}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8460248494035766006}
+    - gameObject: {fileID: 7583756930290804199}
+    - gameObject: {fileID: 8691601371041149407}
+    - gameObject: {fileID: 3161106526278752775}
+    - gameObject: {fileID: 983928321077698655}
+    - gameObject: {fileID: 4493318351616086192}
+    - gameObject: {fileID: 7833803437519831564}
+    - gameObject: {fileID: 6301372275407792793}
+    - gameObject: {fileID: 3514576898811181058}
+    - gameObject: {fileID: 7676295276959900716}
   isAssetBundle: 1
 --- !u!1 &694216056308444776
 GameObject:
@@ -821,7 +851,7 @@ RectTransform:
   m_Father: {fileID: 5307082538927780276}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0.974, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1149,7 +1179,7 @@ GameObject:
   - component: {fileID: 1476782049723506146}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Slider_Score1
+  m_Name: Slider_Score2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1866,7 +1896,7 @@ RectTransform:
   m_Father: {fileID: 8620435976387716660}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0.454, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2007,7 +2037,7 @@ MonoBehaviour:
   m_MinValue: 0
   m_MaxValue: 1
   m_WholeNumbers: 0
-  m_Value: 0.537
+  m_Value: 0.454
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2372,7 +2402,7 @@ GameObject:
   - component: {fileID: 30842790080791622}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text_Score
+  m_Name: Text_ScoreName
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2438,7 +2468,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u51FA\u7D2B"
+  m_Text: "\u51FA\u7D2B\u51FA\u7D2B"
 --- !u!1 &7649505069373587098
 GameObject:
   m_ObjectHideFlags: 0
@@ -2961,12 +2991,12 @@ GameObject:
   - component: {fileID: 8485155282898353359}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: ScoreName
+  m_Name: ScoreRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2895624049724411662
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3005,7 +3035,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9144679203773037795}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 

+ 171 - 0
Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -1343,6 +1343,7 @@ RectTransform:
   - {fileID: 3050252600027618270}
   - {fileID: 8025284597209496932}
   - {fileID: 1103027575177061578}
+  - {fileID: 7331267903340754230}
   m_Father: {fileID: 7858018693182147813}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1728,6 +1729,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u89C4\u5219"
+--- !u!1 &6025665801865041190
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 486793005699165421}
+  - component: {fileID: 9176188176770809839}
+  - component: {fileID: 8188005894248303015}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &486793005699165421
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6025665801865041190}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7331267903340754230}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9176188176770809839
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6025665801865041190}
+  m_CullTransparentMesh: 1
+--- !u!114 &8188005894248303015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6025665801865041190}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.52156866, g: 0.24705882, b: 0.12941177, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 36
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u79EF\u5206\u89C4\u5219"
 --- !u!1 &6027121454098449183
 GameObject:
   m_ObjectHideFlags: 0
@@ -2331,3 +2412,93 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!1 &7912670706253521105
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7331267903340754230}
+  - component: {fileID: 3251758929906146073}
+  - component: {fileID: 2476834815486037468}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7331267903340754230
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7912670706253521105}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 486793005699165421}
+  m_Father: {fileID: 3787544951613840147}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -8.1}
+  m_SizeDelta: {x: 229, y: 51}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3251758929906146073
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7912670706253521105}
+  m_CullTransparentMesh: 1
+--- !u!114 &2476834815486037468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7912670706253521105}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_jx_bt1_db
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a20ad06748b879474357a40506c919d0
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

+ 1 - 0
Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -76,6 +76,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 56fa5ad2eb0770747a94b9281ce1d73e, type: 3}
     - {fileID: 2800000, guid: d51eb6e6d30732e42b4d39217df82220, type: 3}
     - {fileID: 2800000, guid: e1e3be226b84b7d4eb369470fdca7ca3, type: 3}
+    - {fileID: 2800000, guid: 3594a49c71c3592429b1536bae91edb8, type: 3}
     - {fileID: 2800000, guid: afd1dd161eb69954ca5bd3f33d067115, type: 3}
     - {fileID: 2800000, guid: a863559153e6e50479f2e9a8e4963f48, type: 3}
     - {fileID: 2800000, guid: 1b9fb0f76ddb6854e96beb35cd49de7e, type: 3}

+ 21 - 13
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -86,24 +86,29 @@ namespace Fort23.Mono
             StartRoot.gameObject.SetActive(SummonData.isSummonSocre);
             if (SummonData.isSummonSocre)
             {
-                Text_JingDu.text = $"当前进度:{SummonData.drawHistory.Count}/{_openBoxConfig.ProgressRewardChoukaCount}";
+                Text_JingDu.text =
+                    $"当前进度:{SummonData.drawHistory.Count * 10}/{_openBoxConfig.ProgressRewardChoukaCount}";
                 Text_Score.text = $"目前得分:{SummonData.score}";
 
                 OpenBoxScoreRule openBoxScoreRule = CheckAchievements(SummonData);
                 if (openBoxScoreRule.ID != 0)
                 {
-                    ScoreName.SetActive(true);
+                    ScoreRoot.SetActive(true);
+                    Text_ScoreName.text = LanguageManager.Instance.Text(openBoxScoreRule.lanID);
                     Text_ScoreCount.text = $"+{openBoxScoreRule.score}";
+                    Slider_Score2.maxValue = _openBoxConfig.ProgressRewardChoukaCount;
+                    Slider_Score1.maxValue = _openBoxConfig.ProgressRewardChoukaCount;
+                    Slider_Score2.value = SummonData.drawHistory.Count * 10;
+                    Slider_Score1.value = (SummonData.drawHistory.Count - 1) * 10;
                 }
                 else
                 {
-                      ScoreName.SetActive(false);
+                    ScoreRoot.SetActive(false);
                 }
-                
             }
             else
             {
-                ScoreName.SetActive(false);
+                ScoreRoot.SetActive(false);
             }
 
             if (itemInfos.Count > 1)
@@ -143,12 +148,13 @@ namespace Fort23.Mono
         {
             tenButton.gameObject.SetActive(true);
         }
-        
-        
-              // 检查成就匹配
-        private OpenBoxScoreRule  CheckAchievements(AccountFileInfo.SummonData summonData)
+
+
+        // 检查成就匹配
+        private OpenBoxScoreRule CheckAchievements(AccountFileInfo.SummonData summonData)
         {
-            List<OpenBoxScoreRule> openBoxScoreRuleList = PlayerManager.Instance.SummonManager.openBoxScoreRuleMap[summonData.id];
+            List<OpenBoxScoreRule> openBoxScoreRuleList =
+                PlayerManager.Instance.SummonManager.openBoxScoreRuleMap[summonData.id];
 
             List<OpenBoxScoreRule> daChengOpenBoxScoreRuleList = new List<OpenBoxScoreRule>();
             foreach (var openBoxScoreRule in openBoxScoreRuleList)
@@ -158,9 +164,12 @@ namespace Fort23.Mono
 
                 bool allDrawsSatisfy = true;
                 // 检查最近 Para0 次十连是否都满足条件
-                for (int i = summonData.drawHistory.Count - openBoxScoreRule.para0; i < summonData.drawHistory.Count; i++)
+                for (int i = summonData.drawHistory.Count - openBoxScoreRule.para0;
+                     i < summonData.drawHistory.Count;
+                     i++)
                 {
-                    if (!PlayerManager.Instance.SummonManager.CheckSingleDraw(openBoxScoreRule, summonData.drawHistory[i].list))
+                    if (!PlayerManager.Instance.SummonManager.CheckSingleDraw(openBoxScoreRule,
+                            summonData.drawHistory[i].list))
                     {
                         allDrawsSatisfy = false;
                         break;
@@ -178,7 +187,6 @@ namespace Fort23.Mono
                 int id = daChengOpenBoxScoreRuleList.Max(obsr => obsr.ID);
                 OpenBoxScoreRule openBoxScoreRule = ConfigComponent.Instance.Get<OpenBoxScoreRule>(id);
                 return openBoxScoreRule;
-          
             }
 
             return default;

+ 38 - 5
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanelData.cs

@@ -129,15 +129,48 @@ namespace Fort23.Mono
 	      return _Text_ScoreCount;
 	     }
 	   }
-	  private GameObject _ScoreName;
-	  public GameObject ScoreName
+	  private Slider _Slider_Score1;
+	  public Slider Slider_Score1
 	   {
 	   get{
-	      if (_ScoreName == null)
+	      if (_Slider_Score1 == null)
 	       {
-	         _ScoreName  = GetUIUnit<GameObject>("ScoreName"); 
+	         _Slider_Score1  = GetUIUnit<Slider>("Slider_Score1"); 
 	       }
-	      return _ScoreName;
+	      return _Slider_Score1;
+	     }
+	   }
+	  private Slider _Slider_Score2;
+	  public Slider Slider_Score2
+	   {
+	   get{
+	      if (_Slider_Score2 == null)
+	       {
+	         _Slider_Score2  = GetUIUnit<Slider>("Slider_Score2"); 
+	       }
+	      return _Slider_Score2;
+	     }
+	   }
+	  private GameObject _ScoreRoot;
+	  public GameObject ScoreRoot
+	   {
+	   get{
+	      if (_ScoreRoot == null)
+	       {
+	         _ScoreRoot  = GetUIUnit<GameObject>("ScoreRoot"); 
+	       }
+	      return _ScoreRoot;
+	     }
+	   }
+	  private Text _Text_ScoreName;
+	  public Text Text_ScoreName
+	   {
+	   get{
+	      if (_Text_ScoreName == null)
+	       {
+	         _Text_ScoreName  = GetUIUnit<Text>("Text_ScoreName"); 
+	       }
+	      return _Text_ScoreName;
 	     }
 	   }
 	  #endregion 自定义数据结束 

+ 4 - 4
Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs

@@ -46,7 +46,7 @@ namespace Fort23.Mono
                 StartRoot.gameObject.SetActive(summonData.isSummonSocre);
                 if (summonData.isSummonSocre)
                 {
-                    Text_JingDu.text = $"当前进度:{summonData.drawHistory.Count}/{openBoxConfig.ProgressRewardChoukaCount}";
+                    Text_JingDu.text = $"当前进度:{summonData.drawHistory.Count*10}/{openBoxConfig.ProgressRewardChoukaCount}";
                     Text_Score.text = $"目前得分:{summonData.score}";
                 }
             });
@@ -61,7 +61,7 @@ namespace Fort23.Mono
             StartRoot.gameObject.SetActive(summonData.isSummonSocre);
             if (summonData.isSummonSocre)
             {
-                Text_JingDu.text = $"当前进度:{summonData.drawHistory.Count}/{openBoxConfig.ProgressRewardChoukaCount}";
+                Text_JingDu.text = $"当前进度:{summonData.drawHistory.Count*10}/{openBoxConfig.ProgressRewardChoukaCount}";
                 Text_Score.text = $"目前得分:{summonData.score}";
             }
 
@@ -89,7 +89,7 @@ namespace Fort23.Mono
                 {
                     summonScoreAwardWidgets[i].Icon_Select.gameObject.SetActive(true);
 
-                    if (summonData.drawHistory.Count >= openBoxConfig.ProgressRewardChoukaCount)
+                    if (summonData.drawHistory.Count*10 >= openBoxConfig.ProgressRewardChoukaCount)
                     {
                         summonScoreAwardWidgets[i].Btn_LingQu.gameObject.SetActive(true);
                     }
@@ -105,7 +105,7 @@ namespace Fort23.Mono
         {
             //到达进度自动领取奖励
             if (openBoxConfig.ProgressRewardChoukaCount != -1 &&
-                summonData.drawHistory.Count >= openBoxConfig.ProgressRewardChoukaCount)
+                summonData.drawHistory.Count*10 >= openBoxConfig.ProgressRewardChoukaCount)
             {
                 for (var i = openBoxProgressRewards.Length - 1; i >= 0; i--)
                 {

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
UGUIPack/uguiconfig.db


+ 1 - 1
美术/unity_use_ui/TextrueJson/mainUI.txt

@@ -1 +1 @@
-{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_fengling","filePath":"/decorate/dec_fengling.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_guajijiangli","filePath":"/decorate/dec_guajijiangli.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}
+{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_chouka_jinru","filePath":"/decorate/dec_chouka_jinru.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_fengling","filePath":"/decorate/dec_fengling.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_guajijiangli","filePath":"/decorate/dec_guajijiangli.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}

+ 1 - 1
美术/unity_use_ui/TextrueJson/shop.txt

@@ -1 +1 @@
-{"packName":"shop","isTyPack":false,"newTextureJson":[{"textrueName":"dec_10liandiban","filePath":"/decorate/dec_10liandiban.png"},{"textrueName":"dec_choudaijinquan_di","filePath":"/decorate/dec_choudaijinquan_di.png"},{"textrueName":"dec_danchou_diban","filePath":"/decorate/dec_danchou_diban.png"},{"textrueName":"dec_fengelan","filePath":"/decorate/dec_fengelan.png"},{"textrueName":"dec_shangpin_di","filePath":"/decorate/dec_shangpin_di.png"},{"textrueName":"dec_yeqian1","filePath":"/decorate/dec_yeqian1.png"},{"textrueName":"dec_yeqian2","filePath":"/decorate/dec_yeqian2.png"}],"keyToValue":{}}
+{"packName":"shop","isTyPack":false,"newTextureJson":[{"textrueName":"dec_10liandiban","filePath":"/decorate/dec_10liandiban.png"},{"textrueName":"dec_anniu_lingqu","filePath":"/decorate/dec_anniu_lingqu.png"},{"textrueName":"dec_anniu_lingqu_dan","filePath":"/decorate/dec_anniu_lingqu_dan.png"},{"textrueName":"dec_choudaijinquan_di","filePath":"/decorate/dec_choudaijinquan_di.png"},{"textrueName":"dec_danchou_diban","filePath":"/decorate/dec_danchou_diban.png"},{"textrueName":"dec_fengelan","filePath":"/decorate/dec_fengelan.png"},{"textrueName":"dec_lingqu_gg","filePath":"/decorate/dec_lingqu_gg.png"},{"textrueName":"dec_shangpin_di","filePath":"/decorate/dec_shangpin_di.png"},{"textrueName":"dec_yeqian1","filePath":"/decorate/dec_yeqian1.png"},{"textrueName":"dec_yeqian2","filePath":"/decorate/dec_yeqian2.png"}],"keyToValue":{}}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


BIN
美术/unity_use_ui/decorate/dec_anniu_lingqu_dan.png


BIN
美术/unity_use_ui/decorate/dec_chouka_jinru.png


BIN
美术/unity_use_ui/decorate/dec_jx_bt1_db.png


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff