Merge remote-tracking branch 'remotes/origin/main' into cn_merage

# Conflicts:
#	Assets/Content/Config/GlobalCfg.csv
#	Assets/Content/Config/LanguagePackage_cn.csv
#	Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset
#	Assets/Editor/AssetBundle/CheckHotResWindownInfo.asset
#	Assets/Editor/AssetBundle/CheckHotUpdateRes.cs
#	Assets/Editor/Pack/Platform/PackPlatformiOSBuild.cs
#	Assets/Lua/Config/ActivitiesCfg.lua
#	Assets/Lua/Config/ItemCfg1.lua
#	Assets/Lua/Config/RuneShopGiftsCfg.lua
#	Assets/Lua/Config/RuneShopLimitCfg.lua
#	Assets/Lua/Config/ShopCfg.lua
#	Assets/Lua/Core/LuaMain.lua
#	Assets/Lua/Managers/LoginMgr.lua
#	Assets/Lua/Managers/PayMgr.lua
#	Assets/Src/Core/DownLoad/DownloadMgr.cs
#	Assets/Src/GameLogic/GameMgr.cs
#	Assets/Src/GameLogic/LaunchLoadMgr.cs
#	UserSettings/Layouts/default-2021.dwlt

Assets/Content/Icons/ActivityImg/active_icon_jie.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 29b9d7e91229fee49982685f2b9b876a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/ActivityImg/active_icon_shier.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: a65f3103fbb8506418cfd581b399069b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/ActivityImg/active_icon_sichun.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 125aae700c0db6b488795e568bd4fd48
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/ActivityImg/active_icon_taqinhaoli.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 2b892f0ced235a8418b70b691f2a4ded
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/ActivityImg/active_icon_taqinqiandao.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 0205ca72f1107cf449d9a2b6a90d82ee
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/ActivityImg/duihuanhaoli_cn.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: ed2bfee983eb42d40882e6f8f3646a58
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Common/ic_res_daijinquan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 0566a97d858c7a74586a131fd7d8e915
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Common/icon_12_yezi.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: f5983bf95a411b94ca02d6a403c71eff
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/icon_12_yezi.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: ae5171102071ec84db4201322209e941
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/icon_1_wu.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 9a6e1175b4a729b48a4aa4bd73915033
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/icon_2_ge.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: b232e817072eb8d4ab2d284681d77687
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/icon_3_yan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 670eef3b5ff633d4290fc0e9eaef73db
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/icon_4_ying.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 645a4343fd4dc8f4a954c778266a36eb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/icon_luomituanzi.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: c6c737b324de54445a8792e82f1b40a7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: ItemIcons_1024_8
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/item_daijinquan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: cd85f16e400f9d24f8cbbbc2776822c4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Prefabs/UI/UIVoyage/UIVoyage.prefab

@@ -1779,6 +1779,173 @@ MonoBehaviour:
   values: 00000000
   depObjs: []
   activeType: 0
+--- !u!1 &2341071279324681903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5580542889372008039}
+  - component: {fileID: 1716610430699253100}
+  - component: {fileID: 2752072927993723800}
+  - component: {fileID: 4024026973016594668}
+  - component: {fileID: 1819059936757835227}
+  - component: {fileID: 2094066185656573100}
+  m_Layer: 5
+  m_Name: BtnAdd
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5580542889372008039
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2341071279324681903}
+  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: 6284590435731912961}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 35, y: 0}
+  m_SizeDelta: {x: 56, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1716610430699253100
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2341071279324681903}
+  m_CullTransparentMesh: 0
+--- !u!114 &2752072927993723800
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2341071279324681903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: cec7371851a1c4a42ba0f960b1394b06, type: 3}
+  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
+--- !u!114 &4024026973016594668
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2341071279324681903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2752072927993723800}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!95 &1819059936757835227
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2341071279324681903}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 651b2a90a9fc1e744882599674fe5181, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &2094066185656573100
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2341071279324681903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UnityEngine.UI.Button
+  - UnityEngine.Animator
+  - UINode
+  values: 000000010000
+  depObjs: []
+  activeType: 0
 --- !u!1 &2456987680474564821
 GameObject:
   m_ObjectHideFlags: 0
@@ -3072,7 +3239,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -3084,9 +3251,9 @@ MonoBehaviour:
   m_fontSizeMin: 4
   m_fontSizeMax: 32
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -3261,7 +3428,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -3273,9 +3440,9 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -4991,7 +5158,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -5003,9 +5170,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 48
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -6848,6 +7015,7 @@ RectTransform:
   m_Children:
   - {fileID: 6284590434991716328}
   - {fileID: 6284590436379721224}
+  - {fileID: 5580542889372008039}
   m_Father: {fileID: 6284590435907684906}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9733,7 +9901,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -9745,9 +9913,9 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -10689,7 +10857,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -10701,9 +10869,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 48
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -10848,7 +11016,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -10860,9 +11028,9 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0

Assets/Content/Prefabs/UI/UIVoyage/UIVoyageRobbery.prefab

@@ -2233,6 +2233,173 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3334918218901800117
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2532217536704572650}
+  - component: {fileID: 2269729730611803932}
+  - component: {fileID: 1988318433767915440}
+  - component: {fileID: 6601412128134699938}
+  - component: {fileID: 8446276620568537023}
+  - component: {fileID: 3991998711694774632}
+  m_Layer: 5
+  m_Name: BtnAdd
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2532217536704572650
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.00032, y: 1.00032, z: 1.00032}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9107271259175808878}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -180, y: 0}
+  m_SizeDelta: {x: 56, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2269729730611803932
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_CullTransparentMesh: 0
+--- !u!114 &1988318433767915440
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: cec7371851a1c4a42ba0f960b1394b06, type: 3}
+  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
+--- !u!114 &6601412128134699938
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1988318433767915440}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!95 &8446276620568537023
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 651b2a90a9fc1e744882599674fe5181, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &3991998711694774632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UnityEngine.UI.Button
+  - UnityEngine.Animator
+  - UINode
+  values: 000000010000
+  depObjs: []
+  activeType: 0
 --- !u!1 &3572693489592908964
 GameObject:
   m_ObjectHideFlags: 0
@@ -4232,6 +4399,7 @@ RectTransform:
   - {fileID: 2834949626211989799}
   - {fileID: 4127076554929066558}
   - {fileID: 2411046397131090061}
+  - {fileID: 2532217536704572650}
   m_Father: {fileID: 2112945718131300219}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Content/Prefabs/UI/UIVoyage/VoyageRankItem.prefab

@@ -461,6 +461,255 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_key: DscShipScore
+--- !u!1 &4132567781270581212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5047814827893416825}
+  - component: {fileID: 1946478339754126991}
+  - component: {fileID: 1850762919262425590}
+  - component: {fileID: 4550218019529810771}
+  - component: {fileID: 2319406472159236020}
+  m_Layer: 0
+  m_Name: RewordNode
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5047814827893416825
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.00032, y: 1.00032, z: 1.00032}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 227612782194376160}
+  m_Father: {fileID: 4389347264851794669}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -150, y: -40}
+  m_SizeDelta: {x: 260, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1946478339754126991
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_CullTransparentMesh: 1
+--- !u!114 &1850762919262425590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  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: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4550218019529810771
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7b8a986ea914e134996e17fd0c96dde3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  totalCount: 0
+  reverseDirection: 0
+  rubberScale: 1
+  threshold: 100
+  lowGrid: 0
+  m_Cell: {fileID: 70813078944487029, guid: 72497a2a74d401f468ffb167fe95054d, type: 3}
+  m_Content: {fileID: 8382862851887915090}
+  m_Horizontal: 1
+  m_Vertical: 0
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 227612782194376160}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2319406472159236020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UnityEngine.UI.LoopHorizontalScrollRect
+  - UINode
+  values: 0000000100
+  depObjs: []
+  activeType: 0
+--- !u!1 &6738552363692779572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 227612782194376160}
+  - component: {fileID: 7628327736910483951}
+  - component: {fileID: 4216871993346235313}
+  - component: {fileID: 7598088572733092324}
+  - component: {fileID: 9013227157714934232}
+  m_Layer: 0
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &227612782194376160
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.55, y: 0.55, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8382862851887915090}
+  m_Father: {fileID: 5047814827893416825}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 15}
+  m_SizeDelta: {x: 428, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7628327736910483951
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_CullTransparentMesh: 1
+--- !u!114 &4216871993346235313
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7598088572733092324
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &9013227157714934232
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 428
+  m_PreferredHeight: 129
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &6757395737562323709
 GameObject:
   m_ObjectHideFlags: 0
@@ -577,6 +826,106 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 12c233871d685934bbb4e45fb7619c9e, type: 3}
   - {fileID: 21300000, guid: 08ec1b31fafd73743b5fca6c3e6971a5, type: 3}
   - {fileID: 21300000, guid: 6f60d745b0835ea4dbf40b0c594d0440, type: 3}
+--- !u!1 &6970701208680136947
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8382862851887915090}
+  - component: {fileID: 8114645539336504935}
+  - component: {fileID: 2961229266382133589}
+  - component: {fileID: 121567052452394427}
+  m_Layer: 0
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8382862851887915090
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  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: 227612782194376160}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8114645539336504935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UINode
+  - UnityEngine.UI.ContentSizeFitter
+  - UnityEngine.UI.HorizontalLayoutGroup
+  values: 00000001
+  depObjs: []
+  activeType: 0
+--- !u!114 &2961229266382133589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &121567052452394427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 15
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &7101257515868871008
 GameObject:
   m_ObjectHideFlags: 0
@@ -615,6 +964,7 @@ RectTransform:
   - {fileID: 2863844733627312013}
   - {fileID: 6729797696364947679}
   - {fileID: 2483072297388255532}
+  - {fileID: 5047814827893416825}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Content/Raw_Art/UI/Items/icon_10_libao.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: a7765b87433f3344bb84ebf1d14a5c99
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_11_libao.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 1eb4320e293ed63439889a0d011b7f2f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_12_yezi.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 4206443338e7a4c49b89c1026ac1418a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_1_wu.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: cf6e9157048b1da43866d454ef40e4ed
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_2_ge.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 73e8042c3cbb6ed4594bcbd24b6f601c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_3_yan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: d7e9c97ab7942324f815c6bcf0a08fb1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_4_ying.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: c548c4be2daf4a44785ed737877749ce
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_9_libao.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: db373231f58f60149b2ceb82846d4f9f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/icon_luomituanzi.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: b9651d057119d844fa0150fcaaaaa4e3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: ItemIcons_1024_8
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/Items/item_daijinquan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: a9c2cf97975da7c459914189fc05b5a7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/UIActivity/pg_btn.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 68616786021134f41939d7afddc990f6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/AssetBundleMap.cs

@@ -217,8 +217,9 @@ public class AssetBundleMap : EditorWindow
                 if (fileName == "assetbundle")
                 {
                     fileName = AssetsObscureUtil.GetABFileName(fileName);
+                    LogABName("assetbundle", fileName);
                 }
-                else if (fileName == "assetsmapping.bytes")
+                else if (fileName == $"{ GetAssetsMappingName()}.bytes")
                 {
                     EncryptAssetsmapping(file, Path.Combine(assetBundlePath, fileName));
                     continue;
@@ -232,9 +233,18 @@ public class AssetBundleMap : EditorWindow
         AssetDatabase.Refresh();
     }
 
+    private static object GetAssetsMappingName()
+    {
+#if UNITY_IOS
+        return "afi";
+#else
+        return "assetsmapping";
+#endif
+    }
+
     private static Dictionary<BuildTarget, string> s_AssetbundleSavePaths = new Dictionary<BuildTarget, string>()
     {
-        {BuildTarget.iOS, "/ios/"},
+        {BuildTarget.iOS, "/unityRes/"},
         {BuildTarget.Android, "/AssetsAndroid/"},
         {BuildTarget.StandaloneWindows64, "/AssetsPC/"},
          {BuildTarget.WebGL, "/AssetsPC/"},
@@ -397,7 +407,7 @@ public class AssetBundleMap : EditorWindow
             AssetBundleBuild bundle = new AssetBundleBuild();
             bundle.assetBundleName = AssetsObscureUtil.GetABFileName(items.Key);
             bundle.assetNames = items.Value.ToArray();
-
+            LogABName(items.Key,bundle.assetBundleName);
             if (bundle.assetNames.Length == 0)
             {
                 Debug.LogWarning(items.Key + " empty assetNames");
@@ -416,6 +426,18 @@ public class AssetBundleMap : EditorWindow
         return bm.ToArray();
     }
 
+    static string[] logNames = new string[] { "font.unity3d", "shader.unity3d", "UITexture_UILanuch.unity3d" , "UITexture_UILoading.unity3d", "UILanuch_uiprefab.unity3d", "UILoading_uiprefab.unity3d", "assetbundle" };
+    private static void LogABName(string name,string abname)
+    {
+        if (logNames.Contains(name))
+        {
+            Debug.Log($"=========== 包名：【{name}】  ab包名【{abname}】");
+        }
+        else
+        {
+            Debug.Log($"包名：【{name}】  ab包名【{abname}】");
+        }
+    }
     /// <summary>
     /// 只构建lua相关的资源
     /// </summary>

Assets/Editor/AssetBundle/AssetBundleUtil.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using System.Collections.Generic;
 using System.IO;
@@ -1105,12 +1105,20 @@ public class AssetBundleUtil : EditorWindow
         //Create a text file
         UTF8Encoding encoding = new UTF8Encoding(false);
         byte[] bytes = encoding.GetBytes(sb.ToString());
-        using (var fs = File.Open(s_TempAssetBundlePath + "/assetsmapping.bytes", FileMode.OpenOrCreate, FileAccess.ReadWrite))
+
+        using (var fs = File.Open(s_TempAssetBundlePath +$"/{ GetAssetsMappingName()}.bytes", FileMode.OpenOrCreate, FileAccess.ReadWrite))
         {
             fs.Write(bytes, 0, bytes.Length);
         }
     }
-
+    private static string GetAssetsMappingName()
+    {
+#if UNITY_IOS
+        return "afi";
+#else
+        return "assetsmapping";
+#endif
+    }
     static string[] GetAssetsNamesExcludeFileExtension(string path)
     {
         bool isAsset = false;

Assets/Editor/AssetBundle/BundleBuilderZ.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@@ -28,6 +28,13 @@ public class BundleBuilderZ : EditorWindow
     [MenuItem("AssetBundle/MD5Creator")]
     public static void MD5Creator()
     {
+#if UNITY_IOS
+        string versionFileName = "afivs";
+        string assetsFileName = "afimft";
+#else
+          string  versionFileName = "Version";
+          string  assetsFileName = "mainfest";
+#endif
         DicFileMD5 = new Dictionary<string, MD5>();
         string[] files = Directory.GetFiles(FileSystem.PackagePath(), "*", SearchOption.AllDirectories);
         MD5CryptoServiceProvider md5Generator = new MD5CryptoServiceProvider();
@@ -58,7 +65,7 @@ public class BundleBuilderZ : EditorWindow
         }
         EditorUtility.ClearProgressBar();
 
-        string savePath = string.Format("{0}mainfest", FileSystem.PackagePath());
+        string savePath = string.Format("{0}{1}", FileSystem.PackagePath(), assetsFileName);
         // 删除前一版的old数据
         if (File.Exists(savePath))
         {
@@ -77,7 +84,7 @@ public class BundleBuilderZ : EditorWindow
         sb.Append($"{++size},Version,{VersionInfo},0\r\n");
         foreach (KeyValuePair<string, MD5> pair in DicFileMD5)
         {
-            if (pair.Key == "Version" || pair.Key == "mainfest")
+            if (pair.Key == versionFileName || pair.Key == assetsFileName)
             {
                 continue;
             }
@@ -110,7 +117,14 @@ public class BundleBuilderZ : EditorWindow
     {
         VersionInfo = version;
         MD5Creator();
-        FileHelper.WirteStringToFile($"{FileSystem.PackagePath()}Version",version);
+#if UNITY_IOS
+        string versionFileName = "afivs";
+        string assetsFileName = "afimft";
+#else
+          string  versionFileName = "Version";
+          string  assetsFileName = "mainfest";
+#endif
+        FileHelper.WirteStringToFile($"{FileSystem.PackagePath()}{versionFileName}",version);
     }
 
     #region BundleBuidlerDeleteAssetsData;
@@ -288,7 +302,7 @@ public class BundleBuilderZ : EditorWindow
         BuildTarget buildTarget = EditorUserBuildSettings.activeBuildTarget;
         if (buildTarget == BuildTarget.iOS)
         {
-            path = path + "/ios/";
+            path = path + "/unityRes/";
         }
         else if (buildTarget == BuildTarget.Android)
         {

Assets/Editor/AssetBundle/CheckResWindowInfo.cs

@@ -9,7 +9,7 @@ public class CheckResWindowInfo : ScriptableObject
     public string OldPath = "C:/Users/Administrator/Desktop/My/项目/0";
 
 #if UNITY_IOS
-    public string NewPath = "./StreamingAssets/ios";
+    public string NewPath = "./StreamingAssets/unityRes";
 #else
     public string NewPath =  "./StreamingAssets/AssetsAndroid";
 #endif

Assets/Editor/Pack/PackConstant.cs

@@ -28,7 +28,7 @@ namespace Pack
         /// <summary>
         /// IOS 混淆key
         /// </summary>
-        public const string vjk487sdgltrecn = "vjk487sdgltrecn";
+        public const string IOSKey = "jb94nmygdmhdlotr8df";
 
 
         public static readonly string[] NeedFulDefineSymbols = {

Assets/Lua/Config/YuanHangTrialRankCfg.lua

@@ -0,0 +1,58 @@
+local YuanHangTrialRankCfg = {
+[1]={
+['Id']=1,
+['YuanHangTrialRankCondition']={{1,1}},
+['YuanHangTrialRankReward']={{344,30000},{2,1000000},{48,3000}},
+},
+[2]={
+['Id']=2,
+['YuanHangTrialRankCondition']={{2,2}},
+['YuanHangTrialRankReward']={{344,25000},{2,900000},{48,2500}},
+},
+[3]={
+['Id']=3,
+['YuanHangTrialRankCondition']={{3,3}},
+['YuanHangTrialRankReward']={{344,20000},{2,800000},{48,2000}},
+},
+[4]={
+['Id']=4,
+['YuanHangTrialRankCondition']={{4,4}},
+['YuanHangTrialRankReward']={{344,15000},{2,700000},{48,1500}},
+},
+[5]={
+['Id']=5,
+['YuanHangTrialRankCondition']={{5,5}},
+['YuanHangTrialRankReward']={{344,10000},{2,600000},{48,1200}},
+},
+[6]={
+['Id']=6,
+['YuanHangTrialRankCondition']={{6,10}},
+['YuanHangTrialRankReward']={{344,8000},{2,500000},{48,1000}},
+},
+[7]={
+['Id']=7,
+['YuanHangTrialRankCondition']={{11,20}},
+['YuanHangTrialRankReward']={{344,7000},{2,400000},{48,900}},
+},
+[8]={
+['Id']=8,
+['YuanHangTrialRankCondition']={{21,50}},
+['YuanHangTrialRankReward']={{344,6000},{2,300000},{48,800}},
+},
+[9]={
+['Id']=9,
+['YuanHangTrialRankCondition']={{51,100}},
+['YuanHangTrialRankReward']={{344,5000},{2,200000},{48,700}},
+},
+[10]={
+['Id']=10,
+['YuanHangTrialRankCondition']={{101,1000}},
+['YuanHangTrialRankReward']={{344,3000},{2,1500000},{48,600}},
+},
+[11]={
+['Id']=11,
+['YuanHangTrialRankCondition']={{1001,5000}},
+['YuanHangTrialRankReward']={{344,2000},{2,100000},{48,500}},
+},
+}
+return YuanHangTrialRankCfg

Assets/Lua/Config/YuanHangTrialRankCfg.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 58d661b6c49099045a521e7c88a5711b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Enum/Enum.lua

@@ -1233,7 +1233,9 @@ local Enum = {
         RuneShopSpecialPrivilege = 79,
 	    BoliShopLvChange = 80,
         LuckyEggChanged = 81,
-        HardTask = 102
+        HardTask = 102,
+        Hard_S_Task = 103
+        
     },
 
     LevelIncreaseType = {
@@ -1294,6 +1296,8 @@ local Enum = {
         Main    = 3,  --主线任务
         Hard    = 6,  --困难任务
         HardGroup=7,  --困难组
+        Hard_S    = 8,  --困难任务
+        HardGroup_S = 9,  --困难组
     },
     --任务是否已经领取
     TaskState = {

Assets/Lua/Enum/ProtoMsgId.lua

@@ -708,6 +708,10 @@
 	SC_BT_RECHARGE100_REWARD_ACK     = 1751,		--	SCBTRecharge100RewardAck **SCBTRecharge100RewardAck **login.proto ** [SCBTRecharge100RewardAck]
 	CS_MAP_LEVEL_TYPE_CHANGE_REQ     = 1752,		--	CSMapLevelTypeChangeReq **CSMapLevelTypeChangeReq **login.proto **game [CSMapLevelTypeChangeReq]
 	SC_MAP_LEVEL_TYPE_CHANGE_ACK	 = 1753,		--	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
+	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ = 6057,		--	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
+	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK = 6058,		--	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
+	CS_MD5_GET_REQ     				= 1754,   -- CSMd5GetReq **CSMd5GetReq **login.proto ** [CSMd5GetReq]
+	SC_MD5_GET_ACK     				= 1755,   -- SCMd5GetAck **SCMd5GetAck **login.proto ** [SCMd5GetAck]
 
     }
     return ProtoMsgId

Assets/Lua/Enum/UIEventNames.lua

@@ -565,8 +565,13 @@ local UIEventNames = {
     VOYAGE_CHECK_AIRSHIP_CHANGED = id(),
     VOYAGE_LOG_CHANGED = id(),
     VOYAGE_LOCATION_CHANGED = id(),
+    VOYAGE_CHALLENGE_COUNT_CHANGED = id(),
+
 
     DOJO_CHALLENGE_RESULT_CHANGED = id(),
+
+
+
     --神器事件
     SKILL_EQUIP_LV_UP_REFRESH = id(),
     SKILL_EQUIP_SLOT_REFRESH = id(),

Assets/Lua/Logic/Activities/ActivitiesDataMgr.lua

@@ -181,7 +181,7 @@ function ActivitiesDataMgr:OnActivitiesOpenListNtf(data)
 end
 
 function ActivitiesDataMgr:OnActivitiesChangeNtf(data)
-    --LogError("=====OnActivitiesChangeNtf========"..Inspect(data));
+   -- LogError("=====OnActivitiesChangeNtf========"..Inspect(data));
     self:RefreshActivitiesData(data.activity_data_list,data.cur_day_end_time)
     self:RefreshDayEndTime(data.cur_day_end_time)
     self:RefreshRedPointState()

Assets/Lua/Logic/Activities/ActivityChipRewardItem.lua

@@ -5,7 +5,8 @@ function ActivityChipRewardItem:ctor(actId)
     self.data = {}
     self.map = {}
     self.globalMap = {}
-
+   
+    self.actID = actId
     self:InitData(actId)
 end
 
@@ -29,6 +30,10 @@ end
 
 function ActivityChipRewardItem:SyncSrvData(serverData)
     local collectionRewardData = serverData[3]
+    if collectionRewardData == nil then
+        LogError("actID = "..self.actID)
+        return
+    end 
     for i = 1, #collectionRewardData do
         local data = self.map[collectionRewardData[i].id]
         if data then

Assets/Lua/Logic/Activities/ActivityDailyComulativeRechargeItem.lua

@@ -29,7 +29,7 @@ function ActivityDailyComulativeRechargeItem:GetRewardState()
 end
 
 function ActivityDailyComulativeRechargeItem:HasRedPoint()
-    local displayCfgData = ManagerContainer.CfgMgr:GetNextActivitiesTiredChargeCfgById(self.rewardState, self.curDay)
+    local displayCfgData = ManagerContainer.CfgMgr:GetNextActivitiesTiredChargeCfgById_New(self.rewardState, self.curDay)
     if not displayCfgData then return false end
 
     local dailyTiredCount = ManagerContainer.PayMgr:GetDayRecharge()

Assets/Lua/Logic/ClimbingTower/ClimbingTowerDataMgr.lua

@@ -285,7 +285,7 @@ function ClimbingTowerDataMgr:OnClimbingTowerEndAck(data)
         else
             ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIClimbingTowerBattleWin,{Enum.UIPageName.UIClimbingTower,nil})
         end
-
+        
         self.curChallengeLevel = data.tower_level + 1
         if data.pass_time ~= nil then
             self.lastPassedTime = data.pass_time

Assets/Lua/Logic/HardLevel/HardMissionDataMgr.lua

@@ -5,26 +5,41 @@ function HardMissionDataMgr:ctor()
     --LogError("---------HardMissionDataMgr--------ctor-----")
 	self.TaskGroupList = {}
 	self.GroupCfg = nil
+	self.missionType = 1  -- 1 是困难
+end
+
+function  HardMissionDataMgr:SetMissionType(type)
+	self.missionType = type
 end
 
 function HardMissionDataMgr:InitData()
-	local cfgs = ManagerContainer.CfgMgr:GetHardMissionCfg()
+	local cfgs = nil
+	if self.missionType == 1 then
+		cfgs = ManagerContainer.CfgMgr:GetHardMissionCfg()
+	else
+		cfgs = ManagerContainer.CfgMgr:GetHardMissionCfg()	
+	end
+
+	 
 	for _, v in pairs(cfgs) do
 		if not self.GroupCfg[v.GroupID] then
 			self.GroupCfg[v.GroupID] = GroupItemData:new(v.GroupID)
 		end
 		local group = self.GroupCfg[v.GroupID]
-		group:SetCondition(102,self:GetFirstConditionData(v))
+		local cdtp,cddata =  self:GetFirstConditionData(v)
+		group:SetCondition(cdtp,cddata)
 		group:AddTaskid(v.MissionID)
 	end
 end
 
 function HardMissionDataMgr:GetFirstConditionData(cfg)
 	local data = nil
+	local cdtype = nil
 	if cfg.MissionCondition[1] then
 		data = cfg.MissionCondition[1][2]
+		cdtype = cfg.MissionCondition[1][1]
 	end
-	return data
+	return cdtype,data
 end
 
 function HardMissionDataMgr:RegisterNetEvents()

Assets/Lua/Logic/LuckyEggDataMgr.lua

@@ -192,7 +192,7 @@ function LuckyEggDataMgr:SendLuckyEggReq(activity_id, draw_count, draw_type)
     if not self:IsCanSend(1) then
         return false
     end
-    
+    --LogError("抽取数据"..Inspect({ activity_id = activity_id, draw_type = draw_type, draw_count = draw_count }))
     ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_ACTIVITY_SMASH_EGGS_REQ, { activity_id = activity_id, draw_type = draw_type, draw_count = draw_count })
     return true
 end

Assets/Lua/Logic/TaskDataNew.lua

@@ -75,6 +75,8 @@ function TaskDataNew:CreateTaskByTable(_table, _add)
             [Enum.TaskTag.Main] = {},
             [Enum.TaskTag.Hard] = {},
             [Enum.TaskTag.HardGroup] = {},
+            [Enum.TaskTag.Hard_S] = {},
+            [Enum.TaskTag.HardGroup_S] = {},
             _changeJobTaskData = nil,
             _headCond = {},
             _heroCond = {},
@@ -258,14 +260,14 @@ end
 
 --刷新红点
 function TaskDataNew:RefreshRedPoint()
-    local _dailyCanGet, _weeklyCanGet, _mainLinCanGet,_hardCanGet,_hardGroupCanGet;
+    local _dailyCanGet, _weeklyCanGet, _mainLinCanGet,_hardCanGet,_hardGroupCanGet,_hard_S_CanGet,_hardGroup_S_CanGet;
     _dailyCanGet = self:JudgeCanGetByType(Enum.TaskTag.Daily);
     _weeklyCanGet = self:JudgeCanGetByType(Enum.TaskTag.Weekly);
     _mainLinCanGet = self:JudgeCanGetByType(Enum.TaskTag.Main);
     _hardCanGet = self:JudgeCanGetByType(Enum.TaskTag.Hard)
     _hardGroupCanGet = self:JudgeCanGetByType(Enum.TaskTag.HardGroup)
-    -- [Enum.TaskTag.Hard] = {},
-    -- [Enum.TaskTag.HardGroup] = {},
+    _hard_S_CanGet = self:JudgeCanGetByType(Enum.TaskTag.Hard_S)
+    _hardGroup_S_CanGet = self:JudgeCanGetByType(Enum.TaskTag.HardGroup_S)
     local _openTaskTag = Enum.TaskTag.Daily;
     if _dailyCanGet then
     elseif _weeklyCanGet then
@@ -276,8 +278,10 @@ function TaskDataNew:RefreshRedPoint()
 
     local _canGetTask = _dailyCanGet or _weeklyCanGet or _mainLinCanGet
     local _canGetHardTask = _hardCanGet or _hardGroupCanGet
+    local _canGetHard_S_Task = _hard_S_CanGet or _hardGroup_S_CanGet
     ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.RED_POINT_MGR_NOTICE, Enum.RPNotifyType.Task, _canGetTask);
     ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.RED_POINT_MGR_NOTICE, Enum.RPNotifyType.HardTask, _canGetHardTask);
+    ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.RED_POINT_MGR_NOTICE, Enum.RPNotifyType.Hard_S_Task, _canGetHard_S_Task);
     return _openTaskTag;
 end
 

Assets/Lua/Logic/UserData.lua

@@ -2272,6 +2272,7 @@ function UserData:SyncRoleDataToSDK()
     if self.serverStartTime then
         gameRoleInfo.openServerTime = self.serverStartTime / 1000
     end
+    ManagerContainer.OpenPayMgr:SetOpenData(gameRoleInfo.openId,gameRoleInfo.roleName , gameRoleInfo.roleLv, gameRoleInfo.serverName)
     return gameRoleInfo
 end
 

Assets/Lua/Logic/Voyage/VoyageDataMgr.lua

@@ -34,6 +34,11 @@ function VoyageDataMgr:ctor()
     self.keepVoyageing = nil
     self:ClearViewListData()
     self.selfAirShipData = nil
+    self.buyNum = 0
+    self.buyNumCost = 0
+    self.buyType = 2
+    self.numLimit = 0
+    self.challengeCountLimit  = 0
     -- if self.selfAirShipCompleteTimer then
     --     self.selfAirShipCompleteTimer:Stop()
     --     self.selfAirShipCompleteTimer = nil
@@ -102,6 +107,8 @@ function VoyageDataMgr:RegisterNetEvents()
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_CHALLENGE_RESULT_ACK, self.OnVoyageChallengeResultAck, self)
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_RANK_LIST_ACK, self.OnVoyageRankDatasAck, self)
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_LOG_ACK, self.OnVoyageLogAck, self)
+
+    ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK ,self.OnBuyNumAck,self)
 end
 
 function VoyageDataMgr:UnRegisterNetEvents()
@@ -116,6 +123,8 @@ function VoyageDataMgr:UnRegisterNetEvents()
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_CHALLENGE_RESULT_ACK)
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_RANK_LIST_ACK)
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_LOG_ACK)
+
+    ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK )
 end
 
 function VoyageDataMgr:IsCanSend(key, cdTime)
@@ -149,6 +158,7 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
     if not data then
         return
     end
+    LogError("[wboy] RefreshSelfVoyageData " .. Inspect(data))
     local challengeNum = data.challenge_num or 0
     local voyageNum = data.trial_num or 0
     local curAirShipId = data.refresh_trial_type or 1
@@ -158,9 +168,12 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
     self.challengeNum = challengeNum
     self.voyageNum = voyageNum
     self.curAirShipId = curAirShipId
-
+    self.buyNum = data.buy_num
+    self.buyNumCost = data.buy_consume
+    self.buyType = data.buy_type
     self:RefreshSelfAirShip(data.trial_data)
-
+    self:RefNumimit()
+    self:RefChallengeCount()
     if changed1 then
         ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.VOYAGE_CHALLENGE_NUM_CHANGED)
     end
@@ -171,7 +184,7 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
         ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.VOYAGE_AIRSHIP_CHANGED)
     end
     if self.rpStatus == nil or self.rpStatus then
-        local rpStatus = (self.voyageNum < GlobalConfig.Instance:GetConfigIntValue(323))
+        local rpStatus = (self.voyageNum <self:GetNumLimit())
         self:SetRpStatus(rpStatus)
     end
 end
@@ -787,4 +800,90 @@ function VoyageDataMgr:ClearLastAttackData()
     end
 end
 
+function  VoyageDataMgr:GetBuyNum()
+    return  self.buyNum
+end
+
+function  VoyageDataMgr:GetBuyCost()
+    return  self.buyNumCost
+end
+function  VoyageDataMgr:GetBuyType()
+    return  self.buyType
+end
+
+function VoyageDataMgr:GetBuyNumLimit()
+    return GlobalConfig.Instance:GetConfigIntValue(364)
+end
+
+
+function VoyageDataMgr:RefNumimit()
+	self.numLimit = GlobalConfig.Instance:GetConfigIntValue(323)
+end
+
+
+function VoyageDataMgr:RefChallengeCount()
+    self.challengeCountLimit = GlobalConfig.Instance:GetConfigIntValue(325) + self.buyNum
+end
+
+
+function VoyageDataMgr:GetChallengeCountLimit()
+    return self.challengeCountLimit 
+end
+
+function  VoyageDataMgr:GetNumLimit()
+    return self.numLimit
+end
+
+
+
+function VoyageDataMgr:GetRewardByRank(rank)
+    if rank == nil or rank == 0 then
+        return nil
+    end
+
+    local rankRewardCfg = ManagerContainer.CfgMgr:GetYuanHangTrialRankCfg()
+
+    for _, rankRewardItem in pairs(rankRewardCfg) do
+        local rankLimit = rankRewardItem.YuanHangTrialRankCondition[1]
+        --LogError(rank.."--------------------rankLimit-----"..Inspect(rankLimit))
+        if rank == rankLimit[1]  then
+            return rankRewardItem.YuanHangTrialRankReward
+        elseif rank >= rankLimit[1]  and  rank <= rankLimit[2] then
+            return rankRewardItem.YuanHangTrialRankReward         
+        end
+    end
+    return nil
+end
+
+
+function VoyageDataMgr:OnBuyNumAck(data)
+	LogError(" SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK  = " .. Inspect(data))
+	if ManagerContainer.NetManager:IsErrorData(data) then return end
+    ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.VOYAGE_CHALLENGE_COUNT_CHANGED)
+end
+
+
+
+function VoyageDataMgr:SendChallengeCountBuyReq()
+	
+	local buyNum = self:GetBuyNum()
+	
+	local buyNumLimit = self:GetBuyNumLimit()
+
+	if (buyNumLimit - buyNum) <= 0 then
+		LogError("购买次数达到上限")
+		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("312")
+		return
+	end
+	local buyType = self:GetBuyType()
+	local cost = self:GetBuyCost()
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {cost, nil, self.SureBuyChallengeNumBtn, self,nil,buyType})
+	
+end
+
+
+function VoyageDataMgr:SureBuyChallengeNumBtn()
+	ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ , {})
+end
+
 return VoyageDataMgr

Assets/Lua/Managers/CfgMgr.lua

@@ -137,7 +137,11 @@ function CfgMgr:ctor()
     self.LevelDifficultCfg = InternalRequire("LevelDifficultCfg")
     self.LevelDebuffCfg = InternalRequire("LevelDebuffCfg")
     self.LevelEnemyAttributeAdditionCfg = InternalRequire("LevelEnemyAttributeAddition")--LevelEnemyAttributeAddition
+    self.LevelEnemyAttributeAddition_S_Cfg = InternalRequire("LevelEnemyAttributeAddition")
     self.HardMissionCfg = InternalRequire("HardMissionCfg")
+    self.YuanHangTrialRankCfg = InternalRequire("YuanHangTrialRankCfg")
+
+    self.ActivitiesTiredChargeCfg_new = self:ActivitiesTiredChargeCfg_CreatNewCfg()
 end
 
 -- function CfgMgr:GetEvilLevelCfg(id)
@@ -1598,6 +1602,7 @@ function CfgMgr:GetNextActivitiesTiredChargeCfgById(index, day)
             closestCfgData = self.ActivitiesTiredChargeCfg[i]
         end
     end
+    --LogError("Day = " .. closestDay.."    Index = " .. closestCfgData.Index)
     for i = closestCfgData.Id, #self.ActivitiesTiredChargeCfg do
         if self.ActivitiesTiredChargeCfg[i].Index > index then
             return self.ActivitiesTiredChargeCfg[i]
@@ -1607,6 +1612,114 @@ function CfgMgr:GetNextActivitiesTiredChargeCfgById(index, day)
     return nil
 end
 
+function CfgMgr:ActivitiesTiredChargeCfg_CreatNewCfg()
+    local ActivitiesTiredChargeCfg_new = {}
+
+
+    for i =1 ,#self.ActivitiesTiredChargeCfg do 
+        local curcfg = self.ActivitiesTiredChargeCfg[i]
+        local dayCfg =  ActivitiesTiredChargeCfg_new[curcfg.Day]
+        if dayCfg == nil then
+            dayCfg = {}
+            table.insert(dayCfg,curcfg)
+            ActivitiesTiredChargeCfg_new[curcfg.Day] = dayCfg      
+            -- LogError("添加 Table = " ..Inspect(dayCfg))
+            -- LogError("添加 到ActivitiesTiredChargeCfg_new = " ..Inspect(ActivitiesTiredChargeCfg_new))
+        else        
+            table.insert(dayCfg,curcfg)        
+        end
+    end 
+
+    for _, v in pairs(ActivitiesTiredChargeCfg_new) do
+        table.sort(v,function (a,b)
+            return a.Index < b.Index
+        end)
+
+        -- for _, vv in pairs(v) do
+        --     LogError("index = " .. vv.Index)
+        -- end
+    end
+
+
+    return ActivitiesTiredChargeCfg_new
+end
+
+function CfgMgr:GetNextActivitiesTiredChargeCfgById_New(index, day)
+    local curDayCfg = self.ActivitiesTiredChargeCfg_new[1]
+    local cloaseDay = 1
+    for K_day, daycfgs in pairs(self.ActivitiesTiredChargeCfg_new) do
+        
+        if K_day <= day and K_day > cloaseDay then
+            cloaseDay = K_day
+        end
+    end
+    curDayCfg = self.ActivitiesTiredChargeCfg_new[cloaseDay]
+  
+    --LogError("Day = " .. cloaseDay.."    Index = " .. curDayCfg[1].Index)
+    
+    for _, v in pairs(curDayCfg) do
+       --LogError("v.index = " .. v.Index.."   index = " .. index)
+        if v.Index > index then
+            return v
+        end
+    end
+    return nil
+end
+
+function CfgMgr:GetActivitiesTiredChargeCfgById_New(index, day)
+    local curDayCfg = self.ActivitiesTiredChargeCfg_new[1]
+    local cloaseDay = 1
+    for K_day, daycfgs in pairs(self.ActivitiesTiredChargeCfg_new) do
+        
+        if K_day <= day and K_day > cloaseDay then
+            cloaseDay = K_day
+        end
+    end
+    curDayCfg = self.ActivitiesTiredChargeCfg_new[cloaseDay]
+  
+    --LogError("Day = " .. cloaseDay.."    Index = " .. curDayCfg[1].Index)
+    if curDayCfg then
+        for _, v in pairs(curDayCfg) do
+           
+            if v.Index >= index then
+                return v
+            end
+          
+        end
+    end
+   
+    return nil
+end
+function CfgMgr:GetNextActivitiesTiredChargeCfg_New_MaxAndMInIndexByDay(day)
+    local curDayCfg = self.ActivitiesTiredChargeCfg_new[1]
+    local cloaseDay = 1
+    for K_day, daycfgs in pairs(self.ActivitiesTiredChargeCfg_new) do
+        
+        if K_day <= day and K_day > cloaseDay then
+            cloaseDay = K_day
+        end
+    end
+    curDayCfg = self.ActivitiesTiredChargeCfg_new[cloaseDay]
+    local max = -1
+    local min = 99999999
+    if curDayCfg == nil then
+        return min, max
+    end
+
+    for _, v in pairs(curDayCfg) do
+        local index = v.Index
+        if min > index then
+            min = index
+        end
+        if max < index then
+            max = index
+        end
+    end
+
+    return min, max
+end
+
+
 function CfgMgr:GetNextActivitiesTiredChargeCfgByNum(num)
     for i = 1, #self.ActivitiesTiredChargeCfg do
         if self.ActivitiesTiredChargeCfg[i].RechargeAmount > num then
@@ -2048,6 +2161,10 @@ function CfgMgr:GetLevelEnemyAttributeAdditionCfgById(id)
     return self.LevelEnemyAttributeAdditionCfg[id]
 end
 
+function CfgMgr:GetLevelEnemyAttributeAddition_S_CfgById(id)
+    return self.LevelEnemyAttributeAddition_S_Cfg[id]
+end
+
 function CfgMgr:GetHardMissionCfgById(id)
     return self.HardMissionCfg[id]
 end
@@ -2055,4 +2172,9 @@ end
 function CfgMgr:GetHardMissionCfg()
     return self.HardMissionCfg
 end
+
+
+function CfgMgr:GetYuanHangTrialRankCfg()
+    return self.YuanHangTrialRankCfg
+end
 return CfgMgr

Assets/Lua/Managers/DataMgr.lua

@@ -58,6 +58,8 @@ function DataMgr:ctor()
     self.BTRechargeRewardDataMgr = require('BTRechargeRewardDataMgr'):new()
 
     self.HardMissionDataMgr = require('HardLevel/HardMissionDataMgr'):new()
+    self.HardMission_S_DataMgr =  require('HardLevel/HardMissionDataMgr'):new()
+    self.HardMission_S_DataMgr:SetMissionType(2)
 end
 
 function DataMgr:RegisterAllDataEvents()

Assets/Lua/Managers/LuaBattleMgr.lua

@@ -39,6 +39,9 @@ function LuaBattleMgr:ctor()
         self.difficultyLvData ={1,1}--困难关卡数据
     end
 
+    if self.difficulty_S_LvData == nil then
+        self.difficulty_S_LvData ={1,1}--噩梦关卡数据
+    end
    
     self.curSimpleLvCgf ={}
 
@@ -589,16 +592,20 @@ end
 -- 設置苦難模式下配置
 function LuaBattleMgr:SetCurDifAttr()
     ManagerContainer.LuaGameMgr:ClearDifAttr()
-    if self.difficulty == 1 then
+    if self.difficulty == 1 or self.difficulty == 2 then
         --ManagerContainer.LuaGameMgr:AddDifAttr(7,100)
-        local curDiffID = self:GetCurDiffLvID()
-        local enemyAttrAddCfg = ManagerContainer.CfgMgr:GetLevelEnemyAttributeAdditionCfgById(curDiffID)
+       
+        local enemyAttrAddCfg = nil
+        if self.difficulty == 1 then
+            local curDiffID = self:GetCurDiffLvID()
+            enemyAttrAddCfg = ManagerContainer.CfgMgr:GetLevelEnemyAttributeAdditionCfgById(curDiffID)
+        else
+            local curDiffID = self:GetCurDiff_S_LvID()
+            enemyAttrAddCfg = ManagerContainer.CfgMgr:GetLevelEnemyAttributeAddition_S_CfgById(curDiffID)        
+        end
+         
         local CurAttrAdd = enemyAttrAddCfg.AttrAdd
 
-        -- for i = 1, #CurAttrAdd, 1 do
-        --     ManagerContainer.LuaGameMgr:AddDifAttr(CurAttrAdd[i][1],CurAttrAdd[i][2])
-        -- end
-
         for _, v in pairs(CurAttrAdd) do
             ManagerContainer.LuaGameMgr:AddDifAttr(v[1],v[2])
         end
@@ -622,9 +629,12 @@ function LuaBattleMgr:SetBattleData(data,first,IsShowEnterNextMap)
     if self.difficulty == 0 then
         self.simpleLvData[1] =  data.map_id
         self.simpleLvData[2] =  data.map_level
-    else
+    elseif self.difficulty == 1 then
         self.difficultyLvData[1] =  data.map_id
         self.difficultyLvData[2] =  data.map_level
+    else
+        self.difficulty_S_LvData[1] =  data.map_id
+        self.difficulty_S_LvData[2] =  data.map_level
     end
 
     if first then
@@ -1031,6 +1041,11 @@ function  LuaBattleMgr:GetCurDiffLvID()
 end
 
 
+function  LuaBattleMgr:GetCurDiff_S_LvID()
+    return self.difficulty_S_LvData[1]*10000 + self.difficulty_S_LvData[2]
+end
+
+
 function LuaBattleMgr:GetCurLevelUniqueId()
     return self.curMapId*10000 + self.curLevelId
 end
@@ -1250,16 +1265,31 @@ end
 function LuaBattleMgr:OnLoadingClose()
     self.IsShowDiffTxt = false
     --LogError("-----------OnLoadingClose--------------")
-    if self.difficulty == Enum.MapModeType.Difficulty then
+    if self.difficulty == Enum.MapModeType.Difficulty or self.difficulty == 2 then
         self.IsShowDiffTxt = true
         ManagerContainer.LuaTimerMgr:AddTimer(500, 1,self,function ()
             ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("DifNtfTxt")
         end,nil);
+    --elseif self.difficulty == 2 then
+            
+    else
+      local cfg = ManagerContainer.CfgMgr:GetPrivilegeCardCfgByLv(2)
+      local curmaplvID = self:GetCurLevelUniqueId()
+       if cfg and cfg.UnlockCond and cfg.UnlockCond[2] == curmaplvID then
+        ManagerContainer.LuaTimerMgr:AddTimer(500, 1,self,function ()
+            ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopBT)
+            --Notice_TeQuanKa
+            ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("Notice_TeQuanKa")
+        end,nil);
+       end 
+
     end
+
+    --if 
 end
 
 function LuaBattleMgr:IsShowDifficultyTxt()
-    return self.difficulty == Enum.MapModeType.Difficulty and self.IsShowDiffTxt
+    return (self.difficulty == Enum.MapModeType.Difficulty or  self.difficulty == 2)and self.IsShowDiffTxt
 end
 
 -- 创建主角形象

Assets/Lua/Managers/ManagerContainer.lua

@@ -46,11 +46,13 @@ function ManagerContainer:InitMgr()
     self.VipChangeMgr = require('VipChangeMgr'):new()
     self.PayMgr = require('PayMgr'):new()
     self.LoginMgr = require('LoginMgr'):new()
+    self.OpenPayMgr = require('OpenPayMgr'):new()
 end
 
 function ManagerContainer:Update()
     self.FSMMgr:Update()
     self.LuaTimerMgr:Update()
+    self.OpenPayMgr:Update()
 end
 
 function ManagerContainer:Reset()
@@ -81,6 +83,9 @@ function ManagerContainer:Reset()
     if self.LuaActorAttributeMgr then
         self.LuaActorAttributeMgr:Clear()
     end
+    if self.OpenPayMgr then
+        self.OpenPayMgr:Clear()
+    end
 end
 
 function ManagerContainer:FieldDestroy(field)

Assets/Lua/Managers/OpenPayMgr.lua

@@ -0,0 +1,223 @@
+local OpenPayMgr = class('OpenPayMgr')
+function OpenPayMgr:ctor()
+    self.openID = "1oijtI"
+    self.productCode = "62071860216202428267772989490827"
+    self.openKey = "f7jMJSjCOYRX2kx7UQ4Ox5zZdAowUSe9"
+    self.userId = ""
+    self.roleName = ""
+    self.serverName = ""
+    self.roleLevel = 0
+    self.sign = ""
+    self.baseUrl = "http://mia.hkhappygame.com/open/getPayUrl"
+    LogError("---------OpenPayMgr --------------")
+
+    self.getPayUrlWWW = nil
+    self.CurPayUrl = nil
+    self.postData = ""
+ --62071860216202428267772989490827
+    self:RegisterNetEvents()
+   
+end
+
+
+---IOS
+-- 25053842546594917787640743618071
+-- 2jqXkC
+-- oxlQZ8zN7QfrC6mMJ9P0pnvPjx8JutlS
+
+function OpenPayMgr:Clear()
+    self.userId = ""
+    self.roleName = ""
+    self.serverName = ""
+    self.roleLevel = 0
+end
+
+function OpenPayMgr:Destroy()
+
+    self:UnRegisterNetEvents()
+end
+
+function OpenPayMgr:SetOpenData(userId,roleName,roleLevel,serverName)
+    self.userId = userId
+    self.roleName = roleName
+    self.serverName = serverName
+    self.roleLevel = roleLevel
+    self.platform = ManagerContainer.LuaGameMgr.platform
+    if self.platform == "SDKHwQuick" then
+        self.openID = "1oijtI"
+        self.productCode = "62071860216202428267772989490827"
+        self.openKey = "f7jMJSjCOYRX2kx7UQ4Ox5zZdAowUSe9"
+    elseif self.platform  ==  "SDKYOUYI_IOS" then   
+        self.openID = "2jqXkC"
+        self.productCode = "25053842546594917787640743618071"
+        self.openKey = "oxlQZ8zN7QfrC6mMJ9P0pnvPjx8JutlS"    
+    else
+        -- self.openID = "2jqXkC"
+        -- self.productCode = "25053842546594917787640743618071"
+        -- self.openKey = "oxlQZ8zN7QfrC6mMJ9P0pnvPjx8JutlS"    
+    end    
+
+    --LogError("---------OpenPayMgr -------------uid = "..userId.."   roleName = "..roleName.."    roleLevel = "..roleLevel.."   serverName = "..serverName)
+end
+--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb, "https://www.baidu.com", nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
+function OpenPayMgr:RegisterNetEvents()
+    ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_MD5_GET_ACK, self.OnGetMD5InfoAck, self)
+end
+
+function OpenPayMgr:UnRegisterNetEvents()
+    ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_MD5_GET_ACK)
+end
+
+
+function OpenPayMgr:Update()
+    if self.getPayUrlWWW ~= nil and self.getPayUrlWWW.isDone then
+        if self.getPayUrlWWW.error and self.getPayUrlWWW.error ~= '' then
+            LogError("获取支付页面失败！！！！")
+        else   
+            LogError(self.getPayUrlWWW.text)
+            local ok, result = RO_XPCALL(JSON.decode, debug.traceback, JSON, self.getPayUrlWWW.text)
+            LogError("result = "..Inspect(result))
+            if ok and result.status then
+                
+                self.CurPayUrl ="http://" ..result.data.payUrl
+                LogError("PayUrl = [[[["..self.CurPayUrl.."]]]]")
+                --ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb,  self.CurPayUrl, nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
+                UnityEngine.Application.OpenURL(self.CurPayUrl)
+            else             
+                LogError("获取支付页面失败！！！！")               
+            end
+          
+        end
+
+        self.getPayUrlWWW:Dispose()
+        self.getPayUrlWWW = nil
+    end
+end
+
+function OpenPayMgr:Pay(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
+    local goodsNameNew = amount.."_商品"
+       local goodsIdNew = ""
+    if self.platform == "SDKHwQuick" then
+        goodsIdNew = "product_"..amount.."_ro"
+    elseif self.platform  ==  "SDKYOUYI_IOS" then
+        goodsIdNew = "intention"..amount      
+    else
+        --goodsIdNew = "intention"..amount   
+        goodsIdNew = "product_"..amount.."_ro"
+    end 
+
+
+ 
+    local exstr = "{\"platform\":\""..self.platform.."_MyCard\",\"cpOrderId\":\""..cpOrderId.."\"}"
+    local url,params = self:GetOpenPayUrl(goodsIdNew, goodsNameNew, goodsDesc, count, amount, cpOrderId, cbUrl, exstr)
+
+    local sortParams= {}
+
+    for kv in pairs(params) do
+        if kv ~= nil then
+            table.insert(sortParams,kv)
+        end
+    end
+
+    table.sort(sortParams,function (a,b)
+        return a < b
+    end)
+    local paaramsStr = ""
+    for _, k in pairs(sortParams) do
+        --LogError("["..k.."] = "..params[k])
+        paaramsStr = paaramsStr..k.."="..params[k].."&"
+    end
+    paaramsStr= paaramsStr.. self.openKey
+    --LogError("url = "..url)
+    LogError("paaramsStr =     "..paaramsStr)
+    self.postData = url
+    ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_MD5_GET_REQ, {md5 = paaramsStr})
+end
+
+
+function OpenPayMgr:GetOpenPayUrl(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
+
+    local params= {}
+    local url ="" --"https://mia.hkhappygame.com/open/getPayUrl?"
+    -- openId string 必传 开放平台开发者身份id，由QuickSDK分配
+    url = url .. "openId=" .. self.openID
+    params['openId'] = self.openID
+    -- productCode string 必传 产品CODE，在QuickSDK后台获取
+    url = url .. "&productCode=" .. self.productCode
+    params['productCode'] = self.productCode
+    -- userId  string 必传 SDK用户的账号ID
+    url = url .. "&userId=" .. self.userId
+    params['userId'] = self.userId
+    -- goodsId string 必传 游戏商品id
+    url = url .. "&goodsId=" .. goodsId
+    params['goodsId'] = goodsId
+    -- cpOrderNostring 选传游戏订单号
+    url = url .. "&cpOrderNostring=" .. cpOrderId
+    params['cpOrderNostring'] = cpOrderId
+    -- orderSubject string 必传 订单标题
+    url = url .. "&orderSubject=" .. goodsDesc
+    params['orderSubject'] = goodsDesc
+    -- roleName string必传 用户角色名
+    url = url .. "&roleName=" .. self.roleName
+    params['roleName'] = self.roleName
+    -- serverName string必传游戏服务器名
+    url = url .. "&serverName=" .. self.serverName
+    params['serverName'] = self.serverName
+    -- goodsName string必传 商品名称
+    url = url .. "&goodsName=" .. goodsName
+    params['goodsName'] = goodsName
+    -- roleLevel int 必传 用户角色等级
+    url = url .. "&roleLevel=" .. self.roleLevel
+    params['roleLevel'] = self.roleLevel
+    -- extrasParams string必传 订单保留参数，原样返回给cp
+    url = url .. "&extrasParams=" .. extrasParams
+    params['extrasParams'] = extrasParams
+    -- callbackUrl string 选传订单回调地址,就是通知cp服务器发货的通知地址 
+    url = url .. "&callbackUrl=" .. cbUrl
+    params['callbackUrl'] = cbUrl
+    -- payType string 选传 支付方式ID，ID获取请参照SDK后台“平台管理”>“支付对照表”。支持多种支付方式，多个支付方式以“|”隔开，比如：12|13|23注意：支付方式ID需满足后台勾选已经支持的第三方支付方式，否则无法显示指定支付方式渠道
+    --url = url .. "&payType=" .. "14"
+    --params['payType'] =  "14"
+    -- countryCode string 选传 国家代码，如CHN。获取请参照SDK后台“平台管理”>“地区管理”注意：国家代码需满足后台勾选已经支持的第三方支付方式，否则无法显示指定国家的支付
+    url = url .. "&countryCode=" .. "TWN"--"en-US"
+    params['countryCode'] = "TWN"--"en-US"
+    -- clientLang string 必传 支付中心语言包，填写地区语言代码，如en-US。默认为中文繁体
+    url = url .. "&clientLang=" .. "zh-tw"--"en-US"
+    params['clientLang'] = "zh-tw"--"en-US"
+    -- payVersion int 选传 第三方支付版本，默认不填写为SDK常规版本。取固定值为：2. 表示平台单独处理版本，此版本平台需传金额和币种进行支付并且SDK不参与商品金额的转换由平台自身处理，平台根据自身情况酌情考虑使用。
+
+    -- amount float 选传 订单金额。如果payVersion的值为2，则必传amount字段
+    url = url .. "&amount=" .. amount
+    params['amount'] = amount
+    -- currency string 选传 选传 订单支付的币种代码。如果payVersion的值为2，则必传currency字段注意：支付币种代码必须为SDK后台货币管理里面所支持的货币代码
+    url = url .. "&currency=" .. "USD"
+    params['currency'] =  "USD"
+    -- sign string 必传 签名串，算法详见第三章签名算法描述
+    url = url .. "&sign="
+    return url,params
+end
+
+
+function OpenPayMgr:OnGetMD5InfoAck(data)
+    if ManagerContainer.NetManager:IsErrorData(data) then
+        return
+    end
+
+    if data.md5 then
+        self.postData= self.postData..data.md5
+    else
+        return     
+    end
+    LogError("md5 = "..data.md5)
+
+    if self.getPayUrlWWW then
+        self.getPayUrlWWW:Dispose()
+        self.getPayUrlWWW = nil
+    end
+
+    LogError("Url = [[["..self.baseUrl.."]]]")
+    LogError("postData = [[["..self.postData.."]]]")
+    self.getPayUrlWWW = UnityEngine.WWW(self.baseUrl,self.postData)
+end
+
+return OpenPayMgr

Assets/Lua/Managers/OpenPayMgr.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c6bd8e1a99fc2bd4a933f80d06e69d17
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Pb/login.txt

@@ -1,5 +1,5 @@
 
-ŠÐ
+âÑ
 login.protoserverproto
 user.proto"0
 
@@ -2661,4 +2661,13 @@ reward_idx 
(R	rewardIdx"
 type
 
(Rtype"C
 SCMapLevelTypeChangeAck
 error
 
(Rerror
-type 
(Rtypebproto3
+type 
(Rtype"(
+&CSCrossYuanHangTrialBuyChallengeNumReq"T
+&SCCrossYuanHangTrialBuyChallengeNumAck
+error
 
(Rerror
+count 
(Rcount"
+CSMd5GetReq
+md5
 
(	Rmd5"5
+SCMd5GetAck
+error
 
(Rerror
+md5 
(	Rmd5bproto3

Assets/Lua/Pb/protocal.txt

@@ -1,7 +1,7 @@
 
-þŠ
+¬Ž
 protocal.protoserverprotocommon.protoerror_code.protologin.proto
-user.proto"¶ä

+user.proto"�æ

 Request7
 CS_PING_REQè 
(2.serverproto.CSPingReqR	CSPINGREQ:
 CS_LOGIN_REQê 
(2.serverproto.CSLoginReqR
@@ -366,7 +366,9 @@ $CS_RUNE_SPECIAL_PRIVILEGE_REWARD_REQ
 CS_ACTIVITY_SMASH_EGGS_MSG_REQÐ
 
(2&.serverproto.CSActivitySmashEggsMsgReqRCSACTIVITYSMASHEGGSMSGREQm
 CS_BT_FIRST_RECHARGE_REWARD_REQÓ
 
(2'.serverproto.CSBTFirstRechargeRewardReqRCSBTFIRSTRECHARGEREWARDREQf
 CS_BT_RECHARGE100_REWARD_REQÖ
 
(2%.serverproto.CSBTRecharge100RewardReqRCSBTRECHARGE100REWARDREQd
-CS_MAP_LEVEL_TYPE_CHANGE_REQØ
 
(2$.serverproto.CSMapLevelTypeChangeReqRCSMAPLEVELTYPECHANGEREQ"â¥
+CS_MAP_LEVEL_TYPE_CHANGE_REQØ
 
(2$.serverproto.CSMapLevelTypeChangeReqRCSMAPLEVELTYPECHANGEREQ”

+.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ©/ 
(23.serverproto.CSCrossYuanHangTrialBuyChallengeNumReqR&CSCROSSYUANHANGTRIALBUYCHALLENGENUMREQ>
+CS_MD5_GET_REQÚ
 
(2.serverproto.CSMd5GetReqRCSMD5GETREQ"¹§
 Response7
 SC_PING_ACKé 
(2.serverproto.SCPingAckR	SCPINGACK:
 SC_LOGIN_ACKë 
(2.serverproto.SCLoginAckR
@@ -843,4 +845,6 @@ $SC_RUNE_SPECIAL_PRIVILEGE_REWARD_ACK
 SC_BT_FIRST_RECHARGE_REWARD_ACKÔ
 
(2'.serverproto.SCBTFirstRechargeRewardAckRSCBTFIRSTRECHARGEREWARDACKS
 SC_BT_RECHARGE100_NTFÕ
 
(2.serverproto.SCBTRecharge100NtfRSCBTRECHARGE100NTFf
 SC_BT_RECHARGE100_REWARD_ACK×
 
(2%.serverproto.SCBTRecharge100RewardAckRSCBTRECHARGE100REWARDACKd
-SC_MAP_LEVEL_TYPE_CHANGE_ACKÙ
 
(2$.serverproto.SCMapLevelTypeChangeAckRSCMAPLEVELTYPECHANGEACKbproto3
+SC_MAP_LEVEL_TYPE_CHANGE_ACKÙ
 
(2$.serverproto.SCMapLevelTypeChangeAckRSCMAPLEVELTYPECHANGEACK”

+.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACKª/ 
(23.serverproto.SCCrossYuanHangTrialBuyChallengeNumAckR&SCCROSSYUANHANGTRIALBUYCHALLENGENUMACK>
+SC_MD5_GET_ACKÛ
 
(2.serverproto.SCMd5GetAckRSCMD5GETACKbproto3

Assets/Lua/Pb/user.txt

@@ -1,5 +1,5 @@
 
-őç
+Ěč
 
 user.protoserverproto"¸

 AccountRole
@@ -1456,7 +1456,7 @@ totalScore
 pet_info 
(2.serverproto.RushPetInfoRpetInfo"—

 	RoleCrossD
 
yuanhangtrial
 
(2.serverproto.RoleYuanHangTrialR
yuanhangtrialD
-
crosstoptower 
(2.serverproto.RoleCrossTopTowerR
crosstoptower"ˇ
+
crosstoptower 
(2.serverproto.RoleCrossTopTowerR
crosstoptower"ö
 RoleYuanHangTrial#
 
challenge_num
 
(RchallengeNum
 	trial_num 
(RtrialNum,
@@ -1465,7 +1465,11 @@ totalScore
 trial_data 
(2.serverproto.YuanHangTrialDataR	trialData<
 log_list (2!.serverproto.YuanHangTrialLogDataRlogList
 trial_score 
(R
-trialScore"…
+trialScore
+buy_num 
(RbuyNum
+buy_consume 
(
R
+buyConsume
+buy_type	 
(RbuyType"…
 YuanHangTrialData
 uid
 
(Ruid
 zone 
(Rzone
@@ -1561,7 +1565,7 @@ BTBaseData.
 first_recharge_reward_state 
(
RfirstRechargeRewardState)
 recharge100_time 
(Rrecharge100Time4
 recharge100_reward_day 
(Rrecharge100RewardDay8
-recharge100_reward_state 
(Rrecharge100RewardState"¬
+recharge100_reward_state 
(Rrecharge100RewardState"®
 Role
 id
 
(Rid2
 	role_base 
(2.serverproto.RoleBaseRroleBase2
@@ -1598,5 +1602,5 @@ role_cross 
(2.serverproto.RoleCrossR	roleCross2
 role_skill_equip 
(2.serverproto.RoleSkillEquipRroleSkillEquip2
 	role_head 
(2.serverproto.RoleHeadRroleHead2
 	role_wish 
(2.serverproto.RoleWishRroleWish,
-role_bt 
(2.serverproto.RoleBTRroleBt?
-role_dif_battle  
(2.serverproto.RoleBattleR
roleDifBattlebproto3
+role_bt 
(2.serverproto.RoleBTRroleBtA
+role_hard_battle  
(2.serverproto.RoleBattleRroleHardBattlebproto3

Assets/Lua/UI/GridViewItem/VoyageRankItem_Generate.lua

@@ -1,3 +1,11 @@
+---@class VoyageRankItem__Generate_content
+---@field public gameObject UnityEngine.GameObject
+---@field public horizontalLayoutGroup UnityEngine.UI.HorizontalLayoutGroup
+
+---@class VoyageRankItem__Generate_rewordNode
+---@field public gameObject UnityEngine.GameObject
+---@field public loopHorizontalScrollRect UnityEngine.UI.LoopHorizontalScrollRect
+
 ---@class VoyageRankItem__Generate_scoreTxt
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text TMPro.TextMeshProUGUI
@@ -31,6 +39,8 @@
 ---@field private vipIcon VoyageRankItem__Generate_vipIcon
 ---@field private nameTxt VoyageRankItem__Generate_nameTxt
 ---@field private scoreTxt VoyageRankItem__Generate_scoreTxt
+---@field private rewordNode VoyageRankItem__Generate_rewordNode
+---@field private content VoyageRankItem__Generate_content
 local VoyageRankItemView = class("VoyageRankItemView")
 
 function VoyageRankItemView:ctor()
@@ -54,6 +64,8 @@ function VoyageRankItemView:InitGenerate(Root, data)
 	self:InitGenerate__5(Root,data)
 	self:InitGenerate__6(Root,data)
 	self:InitGenerate__7(Root,data)
+	self:InitGenerate__8(Root,data)
+	self:InitGenerate__9(Root,data)
 
 
 end
@@ -150,6 +162,34 @@ function VoyageRankItemView:InitGenerate__7(Root, data)
 	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
 end
 
+---@private
+function VoyageRankItemView:InitGenerate__8(Root, data)
+--[[
+	RewordNode
+--]]
+	local tmp = Root:Find("RewordNode").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.rewordNode = tmp
+
+	tmp.loopHorizontalScrollRect = tmp:GetComponent(Enum.TypeInfo.LoopHorizontalScrollRect)
+end
+
+---@private
+function VoyageRankItemView:InitGenerate__9(Root, data)
+--[[
+	RewordNode/Viewport/Content
+--]]
+	local tmp = Root:Find("RewordNode/Viewport/Content").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.content = tmp
+
+	tmp.horizontalLayoutGroup = tmp:GetComponent(Enum.TypeInfo.HorizontalLayoutGroup)
+end
+
 ---@private
 function VoyageRankItemView:GenerateDestroy()
 	if tolua.getpeer(self.rankTxt) ~= nil then
@@ -179,6 +219,14 @@ function VoyageRankItemView:GenerateDestroy()
 		tolua.setpeer(self.scoreTxt, nil)
 	end
 	self.scoreTxt = nil
+	if tolua.getpeer(self.rewordNode) ~= nil then
+		tolua.setpeer(self.rewordNode, nil)
+	end
+	self.rewordNode = nil
+	if tolua.getpeer(self.content) ~= nil then
+		tolua.setpeer(self.content, nil)
+	end
+	self.content = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

Assets/Lua/UI/UIActivity/UIActivityDailyRechargeCtr.lua

@@ -2,6 +2,9 @@ local UIActivityDailyRechargeCtr = class("UIActivityDailyRechargeCtr", require("
 
 function UIActivityDailyRechargeCtr:Init(view)
 	self.view = view
+	self.curShowID = 0
+	self.maxID = 0
+	self.minID = 0
 end
 
 function UIActivityDailyRechargeCtr:SetData(data)
@@ -42,6 +45,8 @@ function UIActivityDailyRechargeCtr:GetDailyRewardState()
 	if not activeItem then
 		return 0
 	end
+	--self.curShowID = activeItem:GetRewardState()
+	self.minID,self.maxID =  ManagerContainer.CfgMgr:GetNextActivitiesTiredChargeCfg_New_MaxAndMInIndexByDay(activeItem:GetCurDay())
 	return activeItem:GetRewardState(), activeItem:GetCurDay()
 end
 
@@ -72,5 +77,23 @@ function UIActivityDailyRechargeCtr:OnDispose()
 	self.view = nil
 end
 
+
+function UIActivityDailyRechargeCtr:NextShowID()
+	self.curShowID = self.curShowID + 1
+	if self.curShowID > self.maxID then
+		self.curShowID = self.minID
+	end
+	--LogError(" NextShowID Max = "..self.maxID.."  minID = "..self.minID.."  curShowID = "..self.curShowID)
+	return self.curShowID
+end
+
+function UIActivityDailyRechargeCtr:LastShowID()
+	self.curShowID = self.curShowID - 1
+	if self.curShowID < self.minID then
+		self.curShowID = self.maxID
+	end
+	--LogError("LastShowID  Max = "..self.maxID.."  minID = "..self.minID.."  curShowID = "..self.curShowID)
+	return self.curShowID
+end
 return UIActivityDailyRechargeCtr
 

Assets/Lua/UI/UIActivity/UIActivityDailyRechargeView.lua

@@ -37,6 +37,8 @@ end
 function UIActivityDailyRechargeView:Init()
 	self:InitGrid()
 	self:Refresh()
+	self.lastBtn:SetActive(false)
+	self.nextBtn:SetActive(false)
 end
 
 function UIActivityDailyRechargeView:OnPageInEnd()
@@ -56,7 +58,8 @@ end
 
 function UIActivityDailyRechargeView:Refresh()
 	local rewardState, curDay = self.controller:GetDailyRewardState()
-	local displayCfgData = ManagerContainer.CfgMgr:GetNextActivitiesTiredChargeCfgById(rewardState, curDay)
+	
+	local displayCfgData = ManagerContainer.CfgMgr:GetNextActivitiesTiredChargeCfgById_New(rewardState, curDay)
 	local realCfgData = self.controller:GetNextTiredChargeCfgData()
 	self.rewards:SetActive(displayCfgData ~= nil)
 
@@ -69,17 +72,18 @@ function UIActivityDailyRechargeView:Refresh()
 	self.text3.text.text = dailyTiredCount
 
 	if displayCfgData then
+		self.controller.curShowID = displayCfgData.Index
 		local needChargeCount = self.controller:GetNeedChargeCount()
 		local count = dailyTiredCount >= displayCfgData.RechargeAmount and displayCfgData.RechargeAmount or needChargeCount
 		self.text1.text.text = count
 		if dailyTiredCount >= displayCfgData.RechargeAmount then
-			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount})
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
 		else
-			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge02", {dailyTiredCount, count})
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge02", {dailyTiredCount, count,displayCfgData.RechargeAmount})
 		end
 		self:RefreshReward(displayCfgData)
 	else
-		self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount})
+		self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
 	end
 
 	self.btnConfirm:SetActive(displayCfgData == nil)
@@ -136,6 +140,8 @@ function UIActivityDailyRechargeView:AddUIEventListener()
 	self.uiBase:AddButtonEventListener(self.btnConfirm.button, self, self.OnCloseClick)
 	self.uiBase:AddButtonEventListener(self.btnReceive.button, self, self.OnRewardReceive)
 	self.uiBase:AddButtonEventListener(self.btnRecharge.button, self, self.OnGotoPay)
+	self.uiBase:AddButtonEventListener(self.nextBtn.button,self,self.OnNextBtnClick)
+	self.uiBase:AddButtonEventListener(self.lastBtn.button,self,self.OnLastBtnClick)
 end
 
 function UIActivityDailyRechargeView:ShowItemClick(button, params)
@@ -181,5 +187,48 @@ function UIActivityDailyRechargeView:OnDispose()
 	self.controller:OnDispose()
 end
 
+
+function  UIActivityDailyRechargeView:OnNextBtnClick()
+	self:ShowRewards(self.controller:NextShowID())
+end
+
+function  UIActivityDailyRechargeView:OnLastBtnClick()
+	self:ShowRewards(self.controller:LastShowID())
+end
+
+function UIActivityDailyRechargeView:ShowRewards(id)
+	local rewardState, curDay = self.controller:GetDailyRewardState()
+	
+	local displayCfgData = ManagerContainer.CfgMgr:GetActivitiesTiredChargeCfgById_New(id, curDay)
+	local dailyTiredCount = self.controller:GetDailyTiredChargeCount()
+
+	self.text1:SetActive(displayCfgData and rewardState < displayCfgData.Id and dailyTiredCount < displayCfgData.RechargeAmount)
+	self.text2:SetActive(displayCfgData == nil)
+	self.text3:SetActive(displayCfgData and rewardState < displayCfgData.Id and dailyTiredCount >= displayCfgData.RechargeAmount)
+	self.text2.text.text = dailyTiredCount
+	self.text3.text.text = dailyTiredCount
+
+	if displayCfgData then
+		self.controller.curShowID = displayCfgData.Index
+		local needChargeCount = displayCfgData.RechargeAmount - dailyTiredCount
+		local count = dailyTiredCount >= displayCfgData.RechargeAmount and displayCfgData.RechargeAmount or needChargeCount
+		self.text1.text.text = count
+		if dailyTiredCount >= displayCfgData.RechargeAmount then
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
+		else
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge02", {dailyTiredCount, count,displayCfgData.RechargeAmount})
+		end
+		self:RefreshReward(displayCfgData)
+	else
+		self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
+	end
+
+	self.btnConfirm:SetActive(displayCfgData == nil)
+	self.btnReceive:SetActive(displayCfgData and rewardState <= displayCfgData.Index and dailyTiredCount >= displayCfgData.RechargeAmount)
+	self.btnRecharge:SetActive(displayCfgData and rewardState <= displayCfgData.Index and dailyTiredCount < displayCfgData.RechargeAmount)
+	self.sealBtn:SetActive(displayCfgData and rewardState > displayCfgData.Index )
+end
+
+
 return UIActivityDailyRechargeView
 

Assets/Lua/UI/UIActivity/UIActivityDailyRechargeView_Generate.lua

@@ -2,6 +2,14 @@
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
 
+---@class UIActivityDailyRecharge__Generate_lastBtn
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
+---@class UIActivityDailyRecharge__Generate_nextBtn
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
 ---@class UIActivityDailyRecharge__Generate_btnReceive
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
@@ -59,6 +67,9 @@
 ---@field private btnRecharge UIActivityDailyRecharge__Generate_btnRecharge
 ---@field private btnConfirm UIActivityDailyRecharge__Generate_btnConfirm
 ---@field private btnReceive UIActivityDailyRecharge__Generate_btnReceive
+---@field private sealBtn UnityEngine.GameObject
+---@field private nextBtn UIActivityDailyRecharge__Generate_nextBtn
+---@field private lastBtn UIActivityDailyRecharge__Generate_lastBtn
 ---@field private backBtn UIActivityDailyRecharge__Generate_backBtn
 local UIActivityDailyRechargeView = class("UIActivityDailyRechargeView", require("UIViewBase"))
 
@@ -92,6 +103,9 @@ function UIActivityDailyRechargeView:InitGenerate(Root, data)
 	self:InitGenerate__11(Root,data)
 	self:InitGenerate__12(Root,data)
 	self:InitGenerate__13(Root,data)
+	self:InitGenerate__14(Root,data)
+	self:InitGenerate__15(Root,data)
+	self:InitGenerate__16(Root,data)
 
 
 end
@@ -267,6 +281,46 @@ end
 
 ---@private
 function UIActivityDailyRechargeView:InitGenerate__13(Root, data)
+--[[
+	UIAnimator/Window/Bottom/BtnBox/Seal
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bottom/BtnBox/Seal").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.sealBtn = tmp
+end
+
+---@private
+function UIActivityDailyRechargeView:InitGenerate__14(Root, data)
+--[[
+	UIAnimator/Window/Bottom/ChangeBtn/NextBtn
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bottom/ChangeBtn/NextBtn").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.nextBtn = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
+---@private
+function UIActivityDailyRechargeView:InitGenerate__15(Root, data)
+--[[
+	UIAnimator/Window/Bottom/ChangeBtn/LastBtn
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bottom/ChangeBtn/LastBtn").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.lastBtn = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
+---@private
+function UIActivityDailyRechargeView:InitGenerate__16(Root, data)
 --[[
 	UIAnimator/Window/BtnBack
 --]]
@@ -331,6 +385,18 @@ function UIActivityDailyRechargeView:GenerateDestroy()
 		tolua.setpeer(self.btnReceive, nil)
 	end
 	self.btnReceive = nil
+	if tolua.getpeer(self.sealBtn) ~= nil then
+		tolua.setpeer(self.sealBtn, nil)
+	end
+	self.sealBtn = nil
+	if tolua.getpeer(self.nextBtn) ~= nil then
+		tolua.setpeer(self.nextBtn, nil)
+	end
+	self.nextBtn = nil
+	if tolua.getpeer(self.lastBtn) ~= nil then
+		tolua.setpeer(self.lastBtn, nil)
+	end
+	self.lastBtn = nil
 	if tolua.getpeer(self.backBtn) ~= nil then
 		tolua.setpeer(self.backBtn, nil)
 	end

Assets/Lua/UI/UIActivity/UIActivityFortnightLoginView.lua

@@ -20,7 +20,7 @@ function UIActivityFortnightLoginView:FillContent(data, uiBase)
 		self.transform = gameObject.transform
 	end
 	self:InitGenerate(self.transform, data)
-
+	self.curRewardName.text.text =""
 	self:Init()
 end
 
@@ -32,6 +32,7 @@ function UIActivityFortnightLoginView:Init()
 	self.templateItem:SetActive(false)
 	self:InitUIComs()
 	self:RefreshActData()
+
 end
 
 function UIActivityFortnightLoginView:InitUIComs()
@@ -71,11 +72,25 @@ function UIActivityFortnightLoginView:RefreshActData()
 	if activityItem ~= nil then
 		self.curDayTxt.text.text = activityItem.curDay .. I18N.T("Day")
 		local data = activityItem:GetActivityData()
+		local maxDayData = 0
+		
+		local maxItemCfg = nil
 		if data ~= nil then
 			for i = 1, #data do
-				self:RefreshItemData(self.subActItemLuaList[i],data[i],activityItem.curDay)
+				local itemcfg = self:RefreshItemData(self.subActItemLuaList[i],data[i],activityItem.curDay)
+				if data[i].day > maxDayData then
+					maxDayData = data[i].day
+				
+					maxItemCfg = itemcfg
+				end
 			end
 		end
+
+		if activityItem.curDay > maxDayData  and maxItemCfg then
+			self.curRewardName.text.text = maxItemCfg.Name
+			self.curDayTxt.text.text = maxDayData .. I18N.T("Day")
+		end 
+
 	end
 end
 
@@ -103,12 +118,13 @@ end
 
 function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,curDay)
 	local rewardData = {cfgId = itemData.rewards[1][1], num = itemData.rewards[1][2] }
+	local itemCfg = nil
 	if itemData.isGotReward then
 		rewardItemLua.gotRewardNode:SetActive(true)
 		rewardItemLua.MakeUpNode:SetActive(false)
 		rewardItemLua.shad:SetActive(true)
 		rewardItemLua.iconItem.bg.button.interactable = false
-		local itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData)
+		itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData)
 		if itemData.day == curDay then
 			self.curRewardName.text.text = itemCfg.Name
 		end
@@ -125,7 +141,7 @@ function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,cur
 
 		if itemData.day <= curDay then
 			rewardItemLua.shad:SetActive(false)
-			local itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData, nil, self, self.OnClickGetReward,itemData.day)
+			itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData, nil, self, self.OnClickGetReward,itemData.day)
 			if itemData.day == curDay then
 				self.curRewardName.text.text = itemCfg.Name
 			end
@@ -136,8 +152,10 @@ function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,cur
 	end
 
 	rewardItemLua.iconItem.redPoint:SetActive(itemData.isFinished and (not itemData.isOutdate) and (not itemData.isGotReward))
+	return itemCfg
 end
 
+
 function UIActivityFortnightLoginView:OnClickGetReward(btn,params)
 	local day = params and params[2] or self.makeUpDay
 	local activityItem = self.controller:GetActivityData()

Assets/Lua/UI/UIDojo/UIDojoBuyTimesCtr.lua

@@ -53,5 +53,12 @@ function UIDojoBuyTimesCtr:HandleCallback()
 	end
 end
 
+
+function UIDojoBuyTimesCtr:GetCostType()
+	if self.data then
+		return self.data[6]
+	end
+	return nil
+end
 return UIDojoBuyTimesCtr
 

Assets/Lua/UI/UIDojo/UIDojoBuyTimesView.lua

@@ -24,6 +24,7 @@ function UIDojoBuyTimesView:FillContent(data, uiBase)
 end
 
 function UIDojoBuyTimesView:Init()
+	self:ChangeIcon()
 end
 
 function UIDojoBuyTimesView:SetUIData()
@@ -80,5 +81,19 @@ function UIDojoBuyTimesView:OnClickClose()
 	self.delayTimer:Start()
 end
 
+function  UIDojoBuyTimesView:ChangeIcon()
+	local costType = self.controller:GetCostType()
+	if costType and costType == 54 then
+		
+		self.icon_2:SetActive(false)
+		self.icon_54:SetActive(true)
+	else
+		self.icon_2:SetActive(true)
+		self.icon_54:SetActive(false)
+
+	end
+end
+
+
 return UIDojoBuyTimesView
 

Assets/Lua/UI/UIDojo/UIDojoBuyTimesView_Generate.lua

@@ -29,6 +29,8 @@
 ---@field private AnyBtn UIDojoBuyTimes__Generate_AnyBtn
 ---@field private window UnityEngine.GameObject
 ---@field private closeBtn UIDojoBuyTimes__Generate_closeBtn
+---@field private icon_54 UnityEngine.GameObject
+---@field private icon_2 UnityEngine.GameObject
 ---@field private costText UIDojoBuyTimes__Generate_costText
 ---@field private title UnityEngine.GameObject
 ---@field private leftTimesText UIDojoBuyTimes__Generate_leftTimesText
@@ -61,6 +63,8 @@ function UIDojoBuyTimesView:InitGenerate(Root, data)
 	self:InitGenerate__7(Root,data)
 	self:InitGenerate__8(Root,data)
 	self:InitGenerate__9(Root,data)
+	self:InitGenerate__10(Root,data)
+	self:InitGenerate__11(Root,data)
 
 
 end
@@ -129,6 +133,30 @@ end
 
 ---@private
 function UIDojoBuyTimesView:InitGenerate__6(Root, data)
+--[[
+	UIAnimator/Window/Bg/Center/Bg/Text/Icon_54
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/Center/Bg/Text/Icon_54").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.icon_54 = tmp
+end
+
+---@private
+function UIDojoBuyTimesView:InitGenerate__7(Root, data)
+--[[
+	UIAnimator/Window/Bg/Center/Bg/Text/Icon_2
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/Center/Bg/Text/Icon_2").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.icon_2 = tmp
+end
+
+---@private
+function UIDojoBuyTimesView:InitGenerate__8(Root, data)
 --[[
 	UIAnimator/Window/Bg/Center/Bg/Text/Cost
 --]]
@@ -142,7 +170,7 @@ function UIDojoBuyTimesView:InitGenerate__6(Root, data)
 end
 
 ---@private
-function UIDojoBuyTimesView:InitGenerate__7(Root, data)
+function UIDojoBuyTimesView:InitGenerate__9(Root, data)
 --[[
 	UIAnimator/Window/Bg/Bottom/Title
 --]]
@@ -154,7 +182,7 @@ function UIDojoBuyTimesView:InitGenerate__7(Root, data)
 end
 
 ---@private
-function UIDojoBuyTimesView:InitGenerate__8(Root, data)
+function UIDojoBuyTimesView:InitGenerate__10(Root, data)
 --[[
 	UIAnimator/Window/Bg/Bottom/Title/LeftTimes
 --]]
@@ -168,7 +196,7 @@ function UIDojoBuyTimesView:InitGenerate__8(Root, data)
 end
 
 ---@private
-function UIDojoBuyTimesView:InitGenerate__9(Root, data)
+function UIDojoBuyTimesView:InitGenerate__11(Root, data)
 --[[
 	UIAnimator/Window/Bg/Bottom/BuyBtn
 --]]
@@ -199,6 +227,14 @@ function UIDojoBuyTimesView:GenerateDestroy()
 		tolua.setpeer(self.closeBtn, nil)
 	end
 	self.closeBtn = nil
+	if tolua.getpeer(self.icon_54) ~= nil then
+		tolua.setpeer(self.icon_54, nil)
+	end
+	self.icon_54 = nil
+	if tolua.getpeer(self.icon_2) ~= nil then
+		tolua.setpeer(self.icon_2, nil)
+	end
+	self.icon_2 = nil
 	if tolua.getpeer(self.costText) ~= nil then
 		tolua.setpeer(self.costText, nil)
 	end

Assets/Lua/UI/UILuckyEgg/UILuckyEggCtr.lua

@@ -41,8 +41,13 @@ end
 function UILuckyEggCtr:InitData()
 	local cfgs = {}
 	local cfgSource = ManagerContainer.CfgMgr:GetLuckyEggCfg()
+	--LogError("--------------------self.data.actId-- "..Inspect(self.data.actId))
 	for id, cfg in pairs(cfgSource) do
-		cfgs[#cfgs+1] = cfg
+		--LogError("----------------------"..Inspect(cfg))
+		if cfg.ActivitiesId ==  self.data.actId then
+			--LogError("----------------------"..Inspect(cfg))
+			cfgs[#cfgs+1] = cfg
+		end
 	end
 	table.sort(cfgs, function(a, b)
 		return a.SortId < b.SortId
@@ -92,6 +97,9 @@ function UILuckyEggCtr:GetCfgLength()
 	return self.cfgLength
 end
 
+function UILuckyEggCtr:GetCfgLength_cfg()
+	return  #self.cfgs
+end
 --- 获取额外奖励进度
 function UILuckyEggCtr:GetLuckyEggNumByIdx(idx)
 	local cfg = self:GetCfgByIdx(idx)
@@ -105,7 +113,10 @@ end
 function UILuckyEggCtr:CheckTotalRecharge()
 	local payNum = ManagerContainer.PayMgr:GetTotalRecharge() or 0
 	--- 彩蛋开放最低儲值金额
-	local needNum = 30
+	local needNum = 0
+	if #self.cfgs == 1 then
+		needNum = 0
+	end
 	self.eggActive = payNum >= needNum
 	--- 彩蛋儲值金额需要满足条件才能激活
 	self.cfgLength = self.eggActive and #self.cfgs or #self.cfgs - 1
@@ -114,6 +125,9 @@ end
 --- 根据当前儲值金额判断是否激活彩蛋
 ---@return boolean
 function UILuckyEggCtr:GetEggActiveByPay()
+	if #self.cfgs == 1 then
+		return true
+	end
 	return self.eggActive
 end
 

Assets/Lua/UI/UILuckyEgg/UILuckyEggView.lua

@@ -381,14 +381,24 @@ function UILuckyEggView:RefreshView()
 	local selectIdx = self.controller:GetSelectIdx()
 	local length = self.controller:GetCfgLength()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
-	if length <= 1 then
+	--LogError("length = "..length)
+	if length <= 1  then
 		self.btnArrowL:SetActive(false)
 		self.btnArrowR:SetActive(false)
+
 	else
 		self.btnArrowL:SetActive(true)
 		self.btnArrowR:SetActive(true)
 	end
 
+	if cfg and cfg.Type == 5 and self.controller:GetCfgLength_cfg() == 1 then
+		self.goldenEggToggle:SetActive(false)
+		self.variegationEggToggle:SetActive(true)
+	else
+		self.goldenEggToggle:SetActive(true)
+		self.variegationEggToggle:SetActive(false)
+	end
+
 	if not self.dots then self.dots = {} end
 	local num = #self.dots
 	local dot = nil
@@ -418,6 +428,9 @@ function UILuckyEggView:RefreshLuckyEggBtn()
 	self.controller:CheckTotalRecharge()
 	local selectIdx = self.controller:GetSelectIdx()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
+	if cfg == nil then
+		return
+	end
 	if cfg.UnLock and cfg.UnLock > 0 then
 		local result, val, content = ManagerContainer.UIFuncUnlockMgr:GetFuncLockStatusById(cfg.UnLock)
 		if not result then
@@ -444,6 +457,10 @@ end
 function UILuckyEggView:RefreshTopCurrency()
 	local selectIdx = self.controller:GetSelectIdx()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
+	if cfg == nil then
+		return
+	end
+
 	local costs = cfg.Cost
 	local num = costs and #costs or 0
 	local length = 0
@@ -520,6 +537,9 @@ end
 function UILuckyEggView:RefreshCostCurrency()
 	local selectIdx = self.controller:GetSelectIdx()
 	local cfg = self.controller:GetCfgByIdx(selectIdx)
+	if cfg == nil then
+		return
+	end
 	local method = cfg.Method
 	local costs = cfg.Cost
 	local costCfgId, costNum

Assets/Lua/UI/UIMailBox/UIMailBoxView.lua

@@ -68,7 +68,7 @@ end
 
 function UIMailBoxView:RefreshMailCount()
 	local count = ManagerContainer.DataMgr.MailData:GetMailTotalCount()
-	self.number.text.text = CommonUtil.StringConcat(count, "/50")
+	self.number.text.text = CommonUtil.StringConcat(count, "/150")
 end
 
 function UIMailBoxView:OnMailSelected(button, params)

Assets/Lua/UI/UIMain/UIMainView.lua

@@ -210,13 +210,13 @@ function UIMainView:Init()
 end
 
 function UIMainView:RefreshBoliShopState()
-    if Constant.OpenPay then
-        local curVal = ManagerContainer.PayMgr:GetTotalRecharge()
-        local openCon = GlobalConfig.Instance:GetConfigIntValue(360) or 50
-        self.topView.topRoot.BtnBoliShop:SetActive(curVal >= openCon)
-    else
-        self.topView.topRoot.BtnBoliShop:SetActive(false)
-    end
+    -- if Constant.OpenPay then
+    --     local curVal = ManagerContainer.PayMgr:GetTotalRecharge()
+    --     local openCon = GlobalConfig.Instance:GetConfigIntValue(360) or 50
+    --     self.topView.topRoot.BtnBoliShop:SetActive(curVal >= openCon)
+    -- else
+    --     self.topView.topRoot.BtnBoliShop:SetActive(false)
+    -- end
 end
 
 function UIMainView:DailySignTrigger()

Assets/Lua/UI/UIRoleMain/UIFruitUseView.lua

@@ -115,6 +115,7 @@ end
 
 --使用果实请求返回消息
 function UIFruitUseView:OnAddFruitBack(data)
+		--LogError(Inspect(data))
 		self:InitUIInfo()
 		local index = self.controller:GetHeroDataIndex(data[1]) + 1
 		FruitHeroItemCtr:SetData(self,self["hero"..index],data[2],self.cfgData,self.itemCfgData)