diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_0.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_0.png new file mode 100644 index 0000000000..3515050edc Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_0.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_0.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_0.png.meta new file mode 100644 index 0000000000..072704bf91 --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_0.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2fb8f582a7b947948a24f150278af646 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 44319f1a093d8d14a811fe14c3509e3a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_1.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_1.png new file mode 100644 index 0000000000..9a1c183db8 Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_1.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_1.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_1.png.meta new file mode 100644 index 0000000000..b71da9f363 --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_1.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 0043cb5561392824aa6ad3cc209532e9 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 24be74850eb77814a8f43479f8defe48 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_2.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_2.png new file mode 100644 index 0000000000..4fda07d1ef Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_2.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_2.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_2.png.meta new file mode 100644 index 0000000000..23e00bf5dd --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_2.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: c997a90591890204e965bde94a9dc7f9 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 0bdaed60fd349df4ab0a2030abdaf106 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_3.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_3.png new file mode 100644 index 0000000000..a90f9efa72 Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_3.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_3.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_3.png.meta new file mode 100644 index 0000000000..ffd97127b4 --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_3.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 04b7955c8f3a4ee4db94662fc3848f0e +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 58ae4c944e29833418381f44f2fc99e5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_4.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_4.png new file mode 100644 index 0000000000..3db967311f Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_4.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_4.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_4.png.meta new file mode 100644 index 0000000000..307ed7db1e --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_4.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: b42188140b2a1494b8f92be0ede2d709 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: f50b828b540634d42b51cf3ad700937a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_5.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_5.png new file mode 100644 index 0000000000..18cdfbcf61 Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_5.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_5.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_5.png.meta new file mode 100644 index 0000000000..b3a091b1da --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_5.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 7e09ae4c560b03f4488b8c1846498635 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 5a6556279fdb6a44c98b88698cb465e0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_6.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_6.png new file mode 100644 index 0000000000..be177c495f Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_6.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_6.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_6.png.meta new file mode 100644 index 0000000000..ac7d7cfb8d --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_6.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 38e5db2720928614baa9d70f5558438d +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 56a2fd2c536772c4880795dcc1d25965 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_7.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_7.png new file mode 100644 index 0000000000..6101cee84e Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_7.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_7.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_7.png.meta new file mode 100644 index 0000000000..3220bc9a54 --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_7.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 1bd483242ad7cf14aab2aacaa11ffd07 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: e20200a8b357ae44ba0c6128a0161b8b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_8.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_8.png new file mode 100644 index 0000000000..445dc309e5 Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_8.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_8.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_8.png.meta new file mode 100644 index 0000000000..98ba40c6b6 --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_8.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 9be2970b94bc46547a0b5a25af37ec38 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 45b9ffe78039e244f9aa947da89d60d7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_9.png b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_9.png new file mode 100644 index 0000000000..51d8a523fd Binary files /dev/null and b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_9.png differ diff --git a/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_9.png.meta b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_9.png.meta new file mode 100644 index 0000000000..a4378a1782 --- /dev/null +++ b/Assets/ManagedResources/Atlas/SunroAtlas/ArtFont/r_fxgz_shuzi_9.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: c5802004eb8f1224499f31342d66b832 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 57bdca7358741354c8feb3ae915fc903 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: SunroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab index a60e2700f2..d0258d500f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &168858978 RectTransform: m_ObjectHideFlags: 0 @@ -112,12 +112,13 @@ RectTransform: m_Children: - {fileID: 721677133} - {fileID: 168858978} + - {fileID: 5821898650707180699} m_Father: {fileID: 1066462918} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -150, y: -342.25} + m_AnchoredPosition: {x: 390, y: -342.25} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &272688417 @@ -8666,6 +8667,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 9999 LanguageIndex: 0 +--- !u!1 &4660483806640443395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5821898650707180699} + - component: {fileID: 817264819269327076} + - component: {fileID: 7741716037982142121} + m_Layer: 5 + m_Name: Num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5821898650707180699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4660483806640443395} + 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_Children: [] + m_Father: {fileID: 272688413} + m_RootOrder: 2 + 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: 9.1} + m_SizeDelta: {x: 80, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &817264819269327076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4660483806640443395} + m_CullTransparentMesh: 0 +--- !u!114 &7741716037982142121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4660483806640443395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4664533075800293046 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua index 408ec019b5..d099bcb997 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua @@ -30,18 +30,19 @@ function this.Show() _itemsList[index] = newObjToParent(this.itemPre, this.itemsLayout) end _itemsList[index]:GetComponent("Button").interactable = false - local Num = Util.GetGameObject(_itemsList[index], "Text"):GetComponent("Text") + local Num = Util.GetGameObject(_itemsList[index], "Num"):GetComponent("Image") local kuang = Util.GetGameObject(_itemsList[index], "kuang") _itemsList[index]:SetActive(true) - Num.text = tonumber(num) if num == "?" then _itemsList[index]:GetComponent("Button").interactable = true Util.AddOnceClick(_itemsList[index], function() this.ChooseAnswer(index) end) kuang:SetActive(false) - Num.text = " ?" + Num.sprite = Util.LoadSprite("r_gonghui_pipeiwenhao") + else + Num.sprite = Util.LoadSprite("r_fxgz_shuzi_"..tonumber(num)) end end end