diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_dazhezhao.png b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_dazhezhao.png deleted file mode 100644 index 07f015b5d1..0000000000 Binary files a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_dazhezhao.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta deleted file mode 100644 index 5c80446dc2..0000000000 --- a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 9d7cddc1469e27b43a9d6972df52b08a -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 55db3e598a5b6d54281809da51109e5b - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: XiaoYao - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png deleted file mode 100644 index 3493268eac..0000000000 Binary files a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png.meta b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png.meta deleted file mode 100644 index 7659e5c981..0000000000 --- a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 1f405bbd99022aa4a9a07cada55ad333 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 46cd0a7a1126fd74581c095c23377104 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: XiaoYao - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png deleted file mode 100644 index e62b1e2b5f..0000000000 Binary files a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png.meta b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png.meta deleted file mode 100644 index c27b6c6d45..0000000000 --- a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 9515d79a7df714c409f08f7ffc5e5291 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: bebf05fa4a836f345b78bbb4510bc131 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: XiaoYao - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png deleted file mode 100644 index 267d68fe64..0000000000 Binary files a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta deleted file mode 100644 index ea8d698712..0000000000 --- a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: f5a0df4dea895324ca1368b5cc417e1f -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 69b07ac43f83f654a83be15c58fac12c - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: XiaoYao - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zidi.png b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zidi.png deleted file mode 100644 index d1aa154bc3..0000000000 Binary files a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zidi.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zidi.png.meta b/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zidi.png.meta deleted file mode 100644 index da610bd085..0000000000 --- a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_zidi.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 99c1872e47465ce4a9332827a3fb8d92 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: c73a8a34478e03b478d7db26345be3bb - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: XiaoYao - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png similarity index 100% rename from Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png rename to Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png diff --git a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png.meta b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png.meta similarity index 69% rename from Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png.meta rename to Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png.meta index 517655bab4..0ba567a023 100644 --- a/Assets/ManagedResources/Atlas/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png.meta +++ b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_ditu_zhezhao.png.meta @@ -69,6 +69,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 58 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -80,7 +113,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: XiaoYao + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 55bf3bb960..9208081292 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -3261,7 +3261,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6a8851429d5982a458c1af37ed7176f9, type: 3} + m_Sprite: {fileID: 21300000, guid: 99c1872e47465ce4a9332827a3fb8d92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1