diff --git a/Assets/arts/effects/texture/glow/glow_wyx_04.png.meta b/Assets/arts/effects/texture/glow/glow_wyx_04.png.meta index 3556ba535..f79e56add 100644 --- a/Assets/arts/effects/texture/glow/glow_wyx_04.png.meta +++ b/Assets/arts/effects/texture/glow/glow_wyx_04.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/glow/light_dzh_0045.png.meta b/Assets/arts/effects/texture/glow/light_dzh_0045.png.meta index 4adebfedf..c889afc2a 100644 --- a/Assets/arts/effects/texture/glow/light_dzh_0045.png.meta +++ b/Assets/arts/effects/texture/glow/light_dzh_0045.png.meta @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/splash/adv_common_flyaura03.tga.meta b/Assets/arts/effects/texture/splash/adv_common_flyaura03.tga.meta index 8ad643a07..906c88211 100644 --- a/Assets/arts/effects/texture/splash/adv_common_flyaura03.tga.meta +++ b/Assets/arts/effects/texture/splash/adv_common_flyaura03.tga.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/splash/boom_wyx_003.png.meta b/Assets/arts/effects/texture/splash/boom_wyx_003.png.meta index e1762d46e..885c33a5e 100644 --- a/Assets/arts/effects/texture/splash/boom_wyx_003.png.meta +++ b/Assets/arts/effects/texture/splash/boom_wyx_003.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/splash/cmn_aura00_2.tga.meta b/Assets/arts/effects/texture/splash/cmn_aura00_2.tga.meta index f363d99a6..6e7ce5ab1 100644 --- a/Assets/arts/effects/texture/splash/cmn_aura00_2.tga.meta +++ b/Assets/arts/effects/texture/splash/cmn_aura00_2.tga.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/splash/equence20_hong.png.meta b/Assets/arts/effects/texture/splash/equence20_hong.png.meta index 42fb96ef7..526ec7106 100644 --- a/Assets/arts/effects/texture/splash/equence20_hong.png.meta +++ b/Assets/arts/effects/texture/splash/equence20_hong.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 94d0e0f0c7eae6544a93d52767d943c0 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 0 - mipBias: -100 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/splash/smoke_dzh_0018_01.png.meta b/Assets/arts/effects/texture/splash/smoke_dzh_0018_01.png.meta index 2ac9555fe..74c105e66 100644 --- a/Assets/arts/effects/texture/splash/smoke_dzh_0018_01.png.meta +++ b/Assets/arts/effects/texture/splash/smoke_dzh_0018_01.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8c6405623dbe21b41842295eacf1039d TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 1024 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android - maxTextureSize: 1024 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: 47 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index e04551ae1..79ca32ab6 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -2506,9 +2506,9 @@ RectTransform: m_Father: {fileID: 445959573539459069} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -314} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 326} m_SizeDelta: {x: 363, y: 84} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4181552087915593989 @@ -4006,9 +4006,9 @@ RectTransform: m_Father: {fileID: 595361820078002785} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -314} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 326} m_SizeDelta: {x: 363, y: 84} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8699042973596539339 @@ -4737,7 +4737,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMin.x @@ -4745,7 +4745,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_SizeDelta.x @@ -4789,7 +4789,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: -505 + value: 135 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4852,7 +4852,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMin.x @@ -4860,7 +4860,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_SizeDelta.x @@ -4904,7 +4904,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: -296 + value: 344 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x