From b5c3fbbbad66336e36d5854835d19d4bb86d174c Mon Sep 17 00:00:00 2001 From: "Liubing\\LB" Date: Mon, 27 Apr 2026 18:57:37 +0800 Subject: [PATCH] =?UTF-8?q?update:=E8=BF=98=E5=8E=9F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Plugins/Android/AndroidManifest.xml | 2 +- .../icon_fishing_travel_108.png.meta | 35 +++-- .../icon_fishing_travel_144.png.meta | 35 +++-- .../icon_fishing_travel_162.png.meta | 35 +++-- .../icon_fishing_travel_192.png.meta | 35 +++-- .../icon_fishing_travel_216.png.meta | 35 +++-- .../icon_fishing_travel_324.png.meta | 35 +++-- .../app_icons/icon_fishing_travel_36.png.meta | 35 +++-- .../icon_fishing_travel_432.png.meta | 35 +++-- .../app_icons/icon_fishing_travel_48.png.meta | 35 +++-- .../app_icons/icon_fishing_travel_72.png.meta | 35 +++-- .../app_icons/icon_fishing_travel_81.png.meta | 35 +++-- .../app_icons/icon_fishing_travel_96.png.meta | 35 +++-- .../icon_fishing_travel_alt.png.meta | 31 ++-- .../app_icons/icon_fishing_travel_bg.png.meta | 35 +++-- .../app_icons/icon_fishing_travel_ft.png.meta | 35 +++-- Client/ProjectSettings/ProjectSettings.asset | 144 +++++++++--------- 17 files changed, 431 insertions(+), 236 deletions(-) diff --git a/Client/Assets/Plugins/Android/AndroidManifest.xml b/Client/Assets/Plugins/Android/AndroidManifest.xml index a0f777986..8034a3483 100644 --- a/Client/Assets/Plugins/Android/AndroidManifest.xml +++ b/Client/Assets/Plugins/Android/AndroidManifest.xml @@ -4,7 +4,7 @@ - + diff --git a/Client/Assets/app_icons/icon_fishing_travel_108.png.meta b/Client/Assets/app_icons/icon_fishing_travel_108.png.meta index d1e261d5c..cdcad2e42 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_108.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_108.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 4ff17ecd4e42e054db6d2085078f20f5 +guid: 54a12cf7ec02e9a41b669dc50d836536 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_144.png.meta b/Client/Assets/app_icons/icon_fishing_travel_144.png.meta index 7fa7c261b..fbda3fb96 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_144.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_144.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: e6182656ea8efb948ad10aac7871dcdb +guid: 95fe90e35b676bd439cb01e752279646 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_162.png.meta b/Client/Assets/app_icons/icon_fishing_travel_162.png.meta index 6f6da985d..657ad75b4 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_162.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_162.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 1570a5eedf0d4634da7275c43309c08d +guid: fb3272bb0545c5242b6e3077c0e896cc TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_192.png.meta b/Client/Assets/app_icons/icon_fishing_travel_192.png.meta index 6633b9b0f..131d464f3 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_192.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_192.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 6fab4dea822786d4eb33116b0ea0daf4 +guid: 548551d5fad77f14e94c5f9498ecd99c TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_216.png.meta b/Client/Assets/app_icons/icon_fishing_travel_216.png.meta index 495b7730b..c637c09c4 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_216.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_216.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: e5d0d4c5080200a45a2779588f97e9eb +guid: 5826faaa5a59b9449bc53028bc97a206 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_324.png.meta b/Client/Assets/app_icons/icon_fishing_travel_324.png.meta index 647fde0c0..fcfbe453e 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_324.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_324.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 026010e822140d249b90ed3a69c3f171 +guid: 91e18bd7ee598934e853e89cffbbf7f8 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_36.png.meta b/Client/Assets/app_icons/icon_fishing_travel_36.png.meta index e236a13ee..fe7cfecb7 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_36.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_36.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: f9221046afbe23c4d8781caaba651259 +guid: 5b3803182b04d89499eb22ba9600e95b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_432.png.meta b/Client/Assets/app_icons/icon_fishing_travel_432.png.meta index a15432b2c..4b0c42a89 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_432.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_432.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 227a60c03a3413f43b94ca253285f451 +guid: 1ab83893951df714fa8f069ea7e48e50 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_48.png.meta b/Client/Assets/app_icons/icon_fishing_travel_48.png.meta index 294b09cfe..0de078039 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_48.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_48.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: be07c5d6e205c1b4888fd3beb6eda3e5 +guid: bc2b50bacf90b2c41b673c1f5abaa393 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_72.png.meta b/Client/Assets/app_icons/icon_fishing_travel_72.png.meta index 7a9362a66..e1725c597 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_72.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_72.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: f7c07794258a42d468d41e1f01abb537 +guid: 848c2c2f077f8874296d87840f90ea2f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_81.png.meta b/Client/Assets/app_icons/icon_fishing_travel_81.png.meta index 9f7de0831..975ad8089 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_81.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_81.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 763c3cf32206acb4683eed62b7c0702d +guid: fec2c737908951241972e96a7cd697ba TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_96.png.meta b/Client/Assets/app_icons/icon_fishing_travel_96.png.meta index b180d92d5..e214879db 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_96.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_96.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: d8b8ee6bf7c46df4aa3689b27a80c111 +guid: 0d630d38f31996043ba7d2c0e458f4db TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_alt.png.meta b/Client/Assets/app_icons/icon_fishing_travel_alt.png.meta index 28df54659..c3cfe10f2 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_alt.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_alt.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 563d8c9c3baad6a4d824618252c1f6b7 +guid: e4ce34c615a0144e0bda815ffec69562 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + 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: Android maxTextureSize: 2048 @@ -112,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_bg.png.meta b/Client/Assets/app_icons/icon_fishing_travel_bg.png.meta index c2a374a2f..214d18ef6 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_bg.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_bg.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 21dd7c46fee682a42a694ebf8d555e48 +guid: ebac3b1703d869e4eb64cadcb06249d4 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/Assets/app_icons/icon_fishing_travel_ft.png.meta b/Client/Assets/app_icons/icon_fishing_travel_ft.png.meta index 718e1f875..06dddad3d 100644 --- a/Client/Assets/app_icons/icon_fishing_travel_ft.png.meta +++ b/Client/Assets/app_icons/icon_fishing_travel_ft.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 6efc8e19da5d0424eb21b4b4538c3652 +guid: 51ae2f9ca9c82754288b652aa02480d8 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 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: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -106,13 +106,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Client/ProjectSettings/ProjectSettings.asset b/Client/ProjectSettings/ProjectSettings.asset index bdb8852fb..8ca066a50 100644 --- a/Client/ProjectSettings/ProjectSettings.asset +++ b/Client/ProjectSettings/ProjectSettings.asset @@ -297,6 +297,78 @@ PlayerSettings: m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: + - m_Textures: + - {fileID: 2800000, guid: 548551d5fad77f14e94c5f9498ecd99c, type: 3} + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 95fe90e35b676bd439cb01e752279646, type: 3} + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 0d630d38f31996043ba7d2c0e458f4db, type: 3} + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 848c2c2f077f8874296d87840f90ea2f, type: 3} + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: bc2b50bacf90b2c41b673c1f5abaa393, type: 3} + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 5b3803182b04d89499eb22ba9600e95b, type: 3} + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 548551d5fad77f14e94c5f9498ecd99c, type: 3} + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 95fe90e35b676bd439cb01e752279646, type: 3} + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 0d630d38f31996043ba7d2c0e458f4db, type: 3} + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 848c2c2f077f8874296d87840f90ea2f, type: 3} + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: bc2b50bacf90b2c41b673c1f5abaa393, type: 3} + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 5b3803182b04d89499eb22ba9600e95b, type: 3} + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: - m_Textures: - {fileID: 2800000, guid: ebac3b1703d869e4eb64cadcb06249d4, type: 3} - {fileID: 2800000, guid: 51ae2f9ca9c82754288b652aa02480d8, type: 3} @@ -339,78 +411,6 @@ PlayerSettings: m_Height: 81 m_Kind: 2 m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 548551d5fad77f14e94c5f9498ecd99c, type: 3} - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 95fe90e35b676bd439cb01e752279646, type: 3} - m_Width: 144 - m_Height: 144 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 0d630d38f31996043ba7d2c0e458f4db, type: 3} - m_Width: 96 - m_Height: 96 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 848c2c2f077f8874296d87840f90ea2f, type: 3} - m_Width: 72 - m_Height: 72 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: bc2b50bacf90b2c41b673c1f5abaa393, type: 3} - m_Width: 48 - m_Height: 48 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 5b3803182b04d89499eb22ba9600e95b, type: 3} - m_Width: 36 - m_Height: 36 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 548551d5fad77f14e94c5f9498ecd99c, type: 3} - m_Width: 192 - m_Height: 192 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 95fe90e35b676bd439cb01e752279646, type: 3} - m_Width: 144 - m_Height: 144 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 0d630d38f31996043ba7d2c0e458f4db, type: 3} - m_Width: 96 - m_Height: 96 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 848c2c2f077f8874296d87840f90ea2f, type: 3} - m_Width: 72 - m_Height: 72 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: bc2b50bacf90b2c41b673c1f5abaa393, type: 3} - m_Width: 48 - m_Height: 48 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 2800000, guid: 5b3803182b04d89499eb22ba9600e95b, type: 3} - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: - m_BuildTarget: iPhone m_Icons: - m_Textures: