修改重名问题

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_事件进度.spriteatlas

@@ -76,12 +76,10 @@ SpriteAtlas:
     - {fileID: 21300000, guid: 08cc5ee6f40805f4180c0771351a0aeb, type: 3}
     - {fileID: 21300000, guid: 2c72d5ed465fd234ebed90d49dfbb653, type: 3}
     - {fileID: 21300000, guid: ddc607e4432dd814395b54f7b1201de4, type: 3}
-    - {fileID: 21300000, guid: aaf0a90038f767a4498ed42ce45bbaa2, type: 3}
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
     packedSpriteRenderDataKeys:
-    - aaf0a90038f767a4498ed42ce45bbaa2: 21300000
     - ddc607e4432dd814395b54f7b1201de4: 21300000
     - db4db7e51f12bd645bd114e1f0af26ea: 21300000
     - dee85966fc3dbd448a3f9979b75072d9: 21300000
@@ -89,14 +87,12 @@ SpriteAtlas:
     - 2c72d5ed465fd234ebed90d49dfbb653: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: aaf0a90038f767a4498ed42ce45bbaa2, type: 3}
   - {fileID: 21300000, guid: ddc607e4432dd814395b54f7b1201de4, type: 3}
   - {fileID: 21300000, guid: db4db7e51f12bd645bd114e1f0af26ea, type: 3}
   - {fileID: 21300000, guid: dee85966fc3dbd448a3f9979b75072d9, type: 3}
   - {fileID: 21300000, guid: 08cc5ee6f40805f4180c0771351a0aeb, type: 3}
   - {fileID: 21300000, guid: 2c72d5ed465fd234ebed90d49dfbb653, type: 3}
   m_PackedSpriteNamesToIndex:
-  - "\u4E3B\u754C\u9762\u2014\u73B0\u4EE3"
   - SB
   - CG
   - JD_D_box

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_冠军时刻.spriteatlas

@@ -77,10 +77,19 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - f9e75d10dd92e584080958d5afcf96ae: 21300000
+    - 6600fad1e5cf10348a0bbfbbf72390ea: 21300000
+    - 5fda1f72452ab144daabea441b302081: 21300000
   m_MasterAtlas: {fileID: 0}
-  m_PackedSprites: []
+  m_PackedSprites:
-  m_PackedSpriteNamesToIndex: []
+  - {fileID: 21300000, guid: f9e75d10dd92e584080958d5afcf96ae, type: 3}
+  - {fileID: 21300000, guid: 6600fad1e5cf10348a0bbfbbf72390ea, type: 3}
+  - {fileID: 21300000, guid: 5fda1f72452ab144daabea441b302081, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - "\u4E3B\u754C\u9762\u2014\u73B0\u4EE3"
+  - GJSKImg
+  - gx_2
   m_RenderDataMap: {}
   m_Tag: "UIRaw_Atlas_\u51A0\u519B\u65F6\u523B"
   m_IsVariant: 0

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas

@@ -72,7 +72,6 @@ SpriteAtlas:
     variantMultiplier: 1
     packables:
     - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3}
-    - {fileID: 21300000, guid: e7f5460757eef7c409168510aa3c5037, type: 3}
     - {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3}
     - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3}
     - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3}
@@ -82,7 +81,6 @@ SpriteAtlas:
     - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3}
     - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3}
     - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3}
-    - {fileID: 21300000, guid: dfa5081d38f50174ca827e79d87b24f7, type: 3}
     - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3}
     - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3}
     bindAsDefault: 1
@@ -92,12 +90,10 @@ SpriteAtlas:
     - e2f0e310f699dd1499e93cb07a0a3198: 21300000
     - 3b8788a5800321a4498485a85c170fc0: 21300000
     - 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000
-    - e7f5460757eef7c409168510aa3c5037: 21300000
     - e0932649c675784419f71913a849d5f2: 21300000
     - 2cfbfa89505825949b3cec3b48d323a6: 21300000
     - 9c5e0e9bd6ee88c4597788568c620662: 21300000
     - 321bf3fcbdc862a46bc384367d7fbe90: 21300000
-    - dfa5081d38f50174ca827e79d87b24f7: 21300000
     - 0f15acdd90c87fe47beedadca47e7010: 21300000
     - d54d40edf100af147a5223de2f881ca3: 21300000
     - af50fc7eee516a645b09aa8f79017aaa: 21300000
@@ -108,12 +104,10 @@ SpriteAtlas:
   - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3}
   - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3}
   - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3}
-  - {fileID: 21300000, guid: e7f5460757eef7c409168510aa3c5037, type: 3}
   - {fileID: 21300000, guid: e0932649c675784419f71913a849d5f2, type: 3}
   - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3}
   - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3}
   - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3}
-  - {fileID: 21300000, guid: dfa5081d38f50174ca827e79d87b24f7, type: 3}
   - {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3}
   - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3}
   - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3}
@@ -123,12 +117,10 @@ SpriteAtlas:
   - xs_k
   - MC
   - DZ_icon
-  - GJSK
   - NL_box 2
   - qz_jr
   - NL_box_1
   - gx
-  - gx_2
   - LWTC_d_box
   - TXK
   - MC_jr

UnityProject/Assets/AssetRaw/UIRaw/Atlas/事件进度/主界面—现代.png.meta

@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: aaf0a90038f767a4498ed42ce45bbaa2
-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
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 0
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/63ffd5332d8c06628a0b7e66ad48eae.png.meta

@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: 4f1245869c095c444abfb965db834341
-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
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 0
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/GJSK.png.meta

@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: e7f5460757eef7c409168510aa3c5037
-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
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 0
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/gx_2.png.meta

@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: dfa5081d38f50174ca827e79d87b24f7
-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
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 0
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: