diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan.meta new file mode 100644 index 0000000000..e0b7e96f71 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 79a55dbade35fe94cbf4e8c763766d01 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont.meta new file mode 100644 index 0000000000..e2dda1819f --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96f87164ec8dcc34a96b814c75c9b69e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont/t_taichumijuan_wenzi.png b/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont/t_taichumijuan_wenzi.png new file mode 100644 index 0000000000..9a1c5e4725 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont/t_taichumijuan_wenzi.png differ diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont/t_taichumijuan_wenzi.png.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont/t_taichumijuan_wenzi.png.meta new file mode 100644 index 0000000000..3cc23e4fbc --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan/ArtFont/t_taichumijuan_wenzi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d00e57efb7a07594c914bf824ff511f4 +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: bd78d8202fa718c43949ae08dccadce2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TaiChuMiJuan + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bannerdi.png b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bannerdi.png new file mode 100644 index 0000000000..41c0f7e186 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bannerdi.png differ diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bannerdi.png.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bannerdi.png.meta new file mode 100644 index 0000000000..276a65bc58 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bannerdi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: cc75023d216df704994210abb18241bc +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: 3a82bc8023c93ab448f08b27fb7686bf + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TaiChuMiJuan + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bj.png b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bj.png new file mode 100644 index 0000000000..4d3a6f2a35 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bj.png differ diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bj.png.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bj.png.meta new file mode 100644 index 0000000000..3121dd55f4 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_bj.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e5174d678f0c29d4b807e5fae001249f +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: 1f302e76992376a4cada874bd361418f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TaiChuMiJuan + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi01.png b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi01.png new file mode 100644 index 0000000000..6b3dd78de7 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi01.png differ diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi01.png.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi01.png.meta new file mode 100644 index 0000000000..a70fc26eed --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e8b6f468b891b504790240e62864a79f +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: 396, y: 717, z: 368, w: 709} + 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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: 5b533282e805a0c49afaa5aa9aa61a97 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TaiChuMiJuan + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi02.png b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi02.png new file mode 100644 index 0000000000..359600c0e6 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi02.png differ diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi02.png.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi02.png.meta new file mode 100644 index 0000000000..3fa85a4cb4 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_mianbandi02.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d59ff4e348a69dd45bbd0200e84e635f +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: 322, y: 726, z: 349, w: 644} + 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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: 892e3544d8343214fb90ac4b2ab3a38a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TaiChuMiJuan + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/t_taichumijuan_zhujiemiananniu.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/t_taichumijuan_zhujiemiananniu.png new file mode 100644 index 0000000000..914147f2e4 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/t_taichumijuan_zhujiemiananniu.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/t_taichumijuan_zhujiemiananniu.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/t_taichumijuan_zhujiemiananniu.png.meta new file mode 100644 index 0000000000..6091cbea0d --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/t_taichumijuan_zhujiemiananniu.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d273621ae1575f84893d25220619a4e0 +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: df2037b357f788a4badd031f096c23dd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab new file mode 100644 index 0000000000..8d3fef79bf --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab @@ -0,0 +1,1083 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &28102036979401825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5333837363576207506} + - component: {fileID: 2261458947074405167} + - component: {fileID: 6402569709667414619} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5333837363576207506 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28102036979401825} + 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: 5665718498097657906} + 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: -133.8} + m_SizeDelta: {x: 462, y: 149} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2261458947074405167 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28102036979401825} + m_CullTransparentMesh: 0 +--- !u!114 &6402569709667414619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28102036979401825} + 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: 0 + 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: 21300000, guid: d00e57efb7a07594c914bf824ff511f4, type: 3} + 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 &2031780158348929598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3086266629382961749} + - component: {fileID: 4653905937005178428} + - component: {fileID: 6874162665726506733} + - component: {fileID: 7308703194412490698} + m_Layer: 5 + m_Name: backBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3086266629382961749 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031780158348929598} + 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: 5665718498097657906} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 98.6} + m_SizeDelta: {x: 140, y: 121} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &4653905937005178428 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031780158348929598} + m_CullTransparentMesh: 0 +--- !u!114 &6874162665726506733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031780158348929598} + 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: 21300000, guid: 2887ec8dbdcb57242a540f77f7cb5a72, type: 3} + 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!114 &7308703194412490698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031780158348929598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6874162665726506733} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &3010540953488580419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 406736504860049708} + - component: {fileID: 3185371786180165057} + - component: {fileID: 7889429126755572255} + - component: {fileID: 5836517051863684561} + m_Layer: 5 + m_Name: bgDi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &406736504860049708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3010540953488580419} + 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: 1058732650776365064} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0006713867, y: 0} + m_SizeDelta: {x: 24, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3185371786180165057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3010540953488580419} + m_CullTransparentMesh: 0 +--- !u!114 &7889429126755572255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3010540953488580419} + 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: 0 + 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: 21300000, guid: e8b6f468b891b504790240e62864a79f, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &5836517051863684561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3010540953488580419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &4690853349369262873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1058732650776365064} + - component: {fileID: 189837394594666668} + - component: {fileID: 4696817990465081718} + - component: {fileID: 750224708655725078} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1058732650776365064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4690853349369262873} + 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: + - {fileID: 292383046426468324} + - {fileID: 1915107041368105942} + - {fileID: 406736504860049708} + m_Father: {fileID: 5665718498097657906} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -20.6} + m_SizeDelta: {x: -46, y: -210} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &189837394594666668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4690853349369262873} + m_CullTransparentMesh: 0 +--- !u!114 &4696817990465081718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4690853349369262873} + 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: 0 + 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: 21300000, guid: d59ff4e348a69dd45bbd0200e84e635f, type: 3} + 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!114 &750224708655725078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4690853349369262873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &4719672612350285489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 768048749102897584} + - component: {fileID: 2313752104281252139} + - component: {fileID: 9140712781283948586} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &768048749102897584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4719672612350285489} + 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: 8329884962036650588} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 178} + m_SizeDelta: {x: -67, y: 372} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2313752104281252139 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4719672612350285489} + m_CullTransparentMesh: 0 +--- !u!114 &9140712781283948586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4719672612350285489} + 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: 21300000, guid: cc75023d216df704994210abb18241bc, type: 3} + 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 &5131992329257900340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8329884962036650588} + - component: {fileID: 3962353440595033484} + - component: {fileID: 4553105843183576068} + - component: {fileID: 2876656824097227893} + m_Layer: 5 + m_Name: itemPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8329884962036650588 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5131992329257900340} + 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: + - {fileID: 768048749102897584} + - {fileID: 4857275258040740634} + m_Father: {fileID: 5665718498097657906} + 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: -2752, y: -72} + m_SizeDelta: {x: 1024, y: 356} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3962353440595033484 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5131992329257900340} + m_CullTransparentMesh: 0 +--- !u!114 &4553105843183576068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5131992329257900340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2876656824097227893} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &2876656824097227893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5131992329257900340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 +--- !u!1 &6340862063794165982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5665718498097657906} + m_Layer: 5 + m_Name: btnRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5665718498097657906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340862063794165982} + 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: + - {fileID: 1058732650776365064} + - {fileID: 5333837363576207506} + - {fileID: 8329884962036650588} + - {fileID: 3086266629382961749} + m_Father: {fileID: 838045334281417467} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6531145027874733707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4857275258040740634} + - component: {fileID: 8890730762987158791} + - component: {fileID: 2198781733884664743} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4857275258040740634 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6531145027874733707} + 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: 8329884962036650588} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -1.9400024, y: 11.7599945} + m_SizeDelta: {x: -106.53, y: -23.509998} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8890730762987158791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6531145027874733707} + m_CullTransparentMesh: 0 +--- !u!114 &2198781733884664743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6531145027874733707} + 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: 0 + 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: 21300000, guid: 7b4370c7a3b9b9d43bf44e61f417724a, type: 3} + 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 &6783067781988425480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6237935301652922318} + - component: {fileID: 1615546810509227993} + - component: {fileID: 7235587292906697026} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6237935301652922318 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6783067781988425480} + 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: 838045334281417467} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1615546810509227993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6783067781988425480} + m_CullTransparentMesh: 0 +--- !u!114 &7235587292906697026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6783067781988425480} + 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: 21300000, guid: e5174d678f0c29d4b807e5fae001249f, type: 3} + 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 &7311530429622308950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 292383046426468324} + - component: {fileID: 4577208638755532487} + - component: {fileID: 947173779260489847} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &292383046426468324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7311530429622308950} + 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: 1058732650776365064} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 5.9986286, y: -10} + m_SizeDelta: {x: 1046, y: 203.7} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &4577208638755532487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7311530429622308950} + m_CullTransparentMesh: 0 +--- !u!114 &947173779260489847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7311530429622308950} + 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: 0 + 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: 21300000, guid: 6cd7bf75933a53243816f8b377e592e1, type: 3} + 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 &7705492895448595525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 838045334281417467} + - component: {fileID: 8219633146266175604} + - component: {fileID: 9122554745421272924} + - component: {fileID: 3619477401438851125} + - component: {fileID: 5648852132197468466} + m_Layer: 5 + m_Name: TaiChuMiJuanPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &838045334281417467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7705492895448595525} + 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: + - {fileID: 6237935301652922318} + - {fileID: 5665718498097657906} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8219633146266175604 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7705492895448595525} + m_CullTransparentMesh: 0 +--- !u!223 &9122554745421272924 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7705492895448595525} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3619477401438851125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7705492895448595525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &5648852132197468466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7705492895448595525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} + m_Name: + m_EditorClassIdentifier: + bgList: + - {fileID: 6783067781988425480} +--- !u!1 &8441491100058205207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9193158905020371500} + - component: {fileID: 921486100088032325} + - component: {fileID: 8871059194096789517} + m_Layer: 5 + m_Name: root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9193158905020371500 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8441491100058205207} + 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: 1915107041368105942} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.000004099007} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &921486100088032325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8441491100058205207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 71 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 23.12 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &8871059194096789517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8441491100058205207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &8477601868341582866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1915107041368105942} + - component: {fileID: 3006324354038409040} + - component: {fileID: 3860835654851360999} + - component: {fileID: 1725631571882342664} + m_Layer: 5 + m_Name: circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1915107041368105942 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477601868341582866} + 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: + - {fileID: 9193158905020371500} + m_Father: {fileID: 1058732650776365064} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0006713867, y: 0.000024796} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.50000006, y: 0.5} +--- !u!222 &3006324354038409040 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477601868341582866} + m_CullTransparentMesh: 0 +--- !u!114 &3860835654851360999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477601868341582866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 9193158905020371500} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1725631571882342664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477601868341582866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab.meta b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab.meta new file mode 100644 index 0000000000..7a36f9a406 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 78badfa9bacacd340b36aa0d8ea4bbbc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index b23543069a..49d313881b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -7094,6 +7094,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7019400324678272696} + - component: {fileID: 1414705437977451223} + - component: {fileID: 8838132903214057687} m_Layer: 5 m_Name: RightDown m_TagString: Untagged @@ -7113,15 +7115,53 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1174661642300151069} + - {fileID: 7679659585813988529} - {fileID: 165462485454605335} m_Father: {fileID: 986452627335843391} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 50} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 252.3, y: 0} + m_Pivot: {x: 1, y: 0} +--- !u!114 &1414705437977451223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 682283706549292340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 81 + m_ChildAlignment: 8 + m_Spacing: -55 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &8838132903214057687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 682283706549292340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &697502373389413099 GameObject: m_ObjectHideFlags: 0 @@ -61108,12 +61148,12 @@ RectTransform: - {fileID: 2393141543341706285} - {fileID: 6848493942208162007} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -104.4, y: 185} - m_SizeDelta: {x: 208.7, y: 187.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 208.70001, y: 187.80005} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8445632292948232348 CanvasRenderer: @@ -66795,6 +66835,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -160} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5505799093322972228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 119690817069795584} + - component: {fileID: 8217469561655222238} + - component: {fileID: 8627580103289282522} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &119690817069795584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505799093322972228} + 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: 7679659585813988529} + m_RootOrder: 0 + 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: 2.175, y: 0} + m_SizeDelta: {x: 204.35, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8217469561655222238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505799093322972228} + m_CullTransparentMesh: 0 +--- !u!114 &8627580103289282522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505799093322972228} + 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: 0 + 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: 21300000, guid: d273621ae1575f84893d25220619a4e0, type: 3} + 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 &5527264345949089561 GameObject: m_ObjectHideFlags: 0 @@ -70555,6 +70669,145 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6982318018571617701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7679659585813988529} + - component: {fileID: 4144326890380073377} + - component: {fileID: 1251308906423233540} + - component: {fileID: 3665830019459992081} + - component: {fileID: 690815757707058175} + m_Layer: 5 + m_Name: taichumijuan + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7679659585813988529 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6982318018571617701} + 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: + - {fileID: 119690817069795584} + - {fileID: 998803897713680703} + m_Father: {fileID: 7019400324678272696} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 208.70001, y: 187.80005} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4144326890380073377 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6982318018571617701} + m_CullTransparentMesh: 0 +--- !u!114 &1251308906423233540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6982318018571617701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3665830019459992081} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &3665830019459992081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6982318018571617701} + 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: 21300000, guid: ce6a5e8caebae894bbb7d3eeb17e8dcb, type: 3} + 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!95 &690815757707058175 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6982318018571617701} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &6982851482232808185 GameObject: m_ObjectHideFlags: 0 @@ -85379,6 +85632,80 @@ MonoBehaviour: m_LineSpacing: 1.3 m_Text: "\u516C\u4F1A" LanguageIndex: 0 +--- !u!1 &8183902688312227531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 998803897713680703} + - component: {fileID: 758011505487036487} + - component: {fileID: 6247085585318051533} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &998803897713680703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8183902688312227531} + 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: 7679659585813988529} + m_RootOrder: 1 + 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: 35.4, y: 23.6} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &758011505487036487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8183902688312227531} + m_CullTransparentMesh: 0 +--- !u!114 &6247085585318051533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8183902688312227531} + 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: 0 + 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: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + 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 &8218091088732983054 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/define.lua b/Assets/ManagedResources/~Lua/Common/define.lua index d3fe6c01b9..280252190f 100644 --- a/Assets/ManagedResources/~Lua/Common/define.lua +++ b/Assets/ManagedResources/~Lua/Common/define.lua @@ -27,6 +27,7 @@ imageDownloadMgr = App.ImageDownloadMgr --PhoneMgr = App.PhoneMgr PoolMgr = App.ObjectPoolMgr WWW = UnityEngine.WWW +Sprite = UnityEngine.Sprite GameObject = UnityEngine.GameObject Camera = UnityEngine.Camera Input = UnityEngine.Input diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 5aaad29033..3eadee92af 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -401,6 +401,7 @@ UIName = { FightLevelTrialPanel = 400,--山河试炼 XunBaoMiZongPanel = 406, --寻宝迷踪 XunBaoMiZongMapPanel = 407, --寻宝迷踪地图界面 + taiChuMiJuan = 408, } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index c35611f78e..1e44b1eb26 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -708,6 +708,10 @@ RANDOMTYPENUM_NUM_FIELD = protobuf.FieldDescriptor(); BEAUTYBAGCARDINFO = protobuf.Descriptor(); BEAUTYBAGCARDINFO_ID_FIELD = protobuf.FieldDescriptor(); BEAUTYBAGCARDINFO_EQUIP_FIELD = protobuf.FieldDescriptor(); +TAICHUSECRETVOLUME = protobuf.Descriptor(); +TAICHUSECRETVOLUME_ID_FIELD = protobuf.FieldDescriptor(); +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD = protobuf.FieldDescriptor(); +TAICHUSECRETVOLUME_WINDOWLINK_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode" @@ -7437,6 +7441,43 @@ BEAUTYBAGCARDINFO.enum_types = {} BEAUTYBAGCARDINFO.fields = {BEAUTYBAGCARDINFO_ID_FIELD, BEAUTYBAGCARDINFO_EQUIP_FIELD} BEAUTYBAGCARDINFO.is_extendable = false BEAUTYBAGCARDINFO.extensions = {} +TAICHUSECRETVOLUME_ID_FIELD.name = "id" +TAICHUSECRETVOLUME_ID_FIELD.full_name = ".rpc.protocols.taiChuSecretvolume.id" +TAICHUSECRETVOLUME_ID_FIELD.number = 1 +TAICHUSECRETVOLUME_ID_FIELD.index = 0 +TAICHUSECRETVOLUME_ID_FIELD.label = 1 +TAICHUSECRETVOLUME_ID_FIELD.has_default_value = false +TAICHUSECRETVOLUME_ID_FIELD.default_value = 0 +TAICHUSECRETVOLUME_ID_FIELD.type = 5 +TAICHUSECRETVOLUME_ID_FIELD.cpp_type = 1 + +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.name = "strategyLink" +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.full_name = ".rpc.protocols.taiChuSecretvolume.strategyLink" +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.number = 2 +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.index = 1 +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.label = 1 +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.has_default_value = false +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.default_value = "" +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.type = 9 +TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.cpp_type = 9 + +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.name = "windowLink" +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.full_name = ".rpc.protocols.taiChuSecretvolume.windowLink" +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.number = 3 +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.index = 2 +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.label = 1 +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.has_default_value = false +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.default_value = "" +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.type = 9 +TAICHUSECRETVOLUME_WINDOWLINK_FIELD.cpp_type = 9 + +TAICHUSECRETVOLUME.name = "taiChuSecretvolume" +TAICHUSECRETVOLUME.full_name = ".rpc.protocols.taiChuSecretvolume" +TAICHUSECRETVOLUME.nested_types = {} +TAICHUSECRETVOLUME.enum_types = {} +TAICHUSECRETVOLUME.fields = {TAICHUSECRETVOLUME_ID_FIELD, TAICHUSECRETVOLUME_STRATEGYLINK_FIELD, TAICHUSECRETVOLUME_WINDOWLINK_FIELD} +TAICHUSECRETVOLUME.is_extendable = false +TAICHUSECRETVOLUME.extensions = {} ActivityInfo = protobuf.Message(ACTIVITYINFO) ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO) @@ -7561,5 +7602,6 @@ endlessHero = protobuf.Message(ENDLESSHERO) endlessSign = protobuf.Message(ENDLESSSIGN) fiveResetTowerInfo = protobuf.Message(FIVERESETTOWERINFO) randomTypeNum = protobuf.Message(RANDOMTYPENUM) +taiChuSecretvolume = protobuf.Message(TAICHUSECRETVOLUME) wishDrawCardInfo = protobuf.Message(WISHDRAWCARDINFO) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua new file mode 100644 index 0000000000..572f484577 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua @@ -0,0 +1,73 @@ +require("Base/BasePanel") +TaiChuMiJuanPanel = Inherit(BasePanel) +local this = TaiChuMiJuanPanel + +--初始化组件(用于子类重写) +function TaiChuMiJuanPanel:InitComponent() + this.spLoader = SpriteLoader.New() + + -- 屏幕适配修改 + this.btnRoot = Util.GetGameObject(self.gameObject, "btnRoot") + + this.itemPre = Util.GetGameObject(this.btnRoot, "itemPre") + + this.title = Util.GetGameObject(this.btnRoot, "title") + this.grid = Util.GetGameObject(this.btnRoot, "bg/circle/root") + this.backBtn = Util.GetGameObject(this.btnRoot, "backBtn") + this.itemPres = {} +end + +--绑定事件(用于子类重写) +function TaiChuMiJuanPanel:BindEvent() + Util.AddClick(this.backBtn,function() + this:ClosePanel() + end) +end + +--添加事件监听(用于子类重写) +function TaiChuMiJuanPanel:AddListener() + +end + +--移除事件监听(用于子类重写) +function TaiChuMiJuanPanel:RemoveListener() + +end + +--副本类型 1 综合 2 万象 +function TaiChuMiJuanPanel:OnOpen(data) + this.data = data +end + +--界面打开时调用(用于子类重写) +function TaiChuMiJuanPanel:OnShow(...) + for i = 1, math.max(#this.itemPres,#this.data) do + if not this.data[i] then + this.itemPres[i].go.gameObject:SetActive(false) + else + if not this.itemPres[i] then + this.itemPres[i] = {} + this.itemPres[i].go = newObjToParent(this.itemPre,this.grid) + this.itemPres[i].bg = Util.GetGameObject(this.itemPres[i].go, "bg"):GetComponent("Image") + end + this.itemPres[i].go.gameObject:SetActive(true) + this.itemPres[i].bg.sprite = this.data[i].sprite + Util.AddOnceClick(this.itemPres[i].go,function() + SDKMgr:OpenWeb(this.data[i].linkAddress) + end) + end + end +end + +--界面关闭时调用(用于子类重写) +function TaiChuMiJuanPanel:OnClose() + +end + +--界面销毁时调用(用于子类重写) +function TaiChuMiJuanPanel:OnDestroy() + this.spLoader:Destroy() + this.itemPres = {} +end + +return TaiChuMiJuanPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua.meta b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua.meta new file mode 100644 index 0000000000..92fcaa685f --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fe181c39a7ac70d4b95a0ab53ceaa8e7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index ee215b6a70..0a79af7f79 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -14,6 +14,76 @@ this.OpenUIList = {} this.selectIndex = {dataType = 0,goodsId = {}} this.selectIndex2 = {dataType = 0,goodsId = {}} this.NiuQiIndex = 1 + +this.TaiChuMiJuanData = {} +function this.SetTaiChuMiJuanData(msg,fun) + local datas + if not msg or #msg.secretvolume < 1 then + ---------------------------------------------测试数据 + datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"}, + [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"}, + [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"}, + [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"}, + [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"}, + [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"}, + [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"}, + [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20200412/3062717289_23_800_349.jpg"}, + } + -- if fun then + -- fun(msg) + -- end + else + datas = msg.secretvolume + end + coroutine.start(function() + for k,v in ipairs(datas) do + local str = v.windowLink + local www = WWW.New(str) + coroutine.www(www) + local tex2d = www.texture + local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0)); + if not this.TaiChuMiJuanData[v.id] then + this.TaiChuMiJuanData[v.id] = {} + this.TaiChuMiJuanData[v.id].id = v.id + this.TaiChuMiJuanData[v.id].linkAddress = v.strategyLink + this.TaiChuMiJuanData[v.id].windowLink = v.windowLink + this.TaiChuMiJuanData[v.id].sprite = m_sprite + end + end + if fun then + fun(msg) + end + end) +end + +function this.GetwwwProgress() + return this.IsFisish +end + +function this.GetATaiChuMiJuanData(data) + this.IsFisish = true + if not this.TaiChuMiJuanData[data.id] or this.TaiChuMiJuanData[data.id].windowLink ~= data.windowLink then + this.IsFisish = false + coroutine.start(function() + local str = data.windowLink + local www = WWW.New(str) + coroutine.www(www) + local tex2d = www.texture + local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0)); + if not this.TaiChuMiJuanData[data.id] then + this.TaiChuMiJuanData[data.id] = {} + end + this.TaiChuMiJuanData[data.id].id = data.id + this.TaiChuMiJuanData[data.id].linkAddress = data.strategyLink + this.TaiChuMiJuanData[data.id].windowLink = data.windowLink + this.TaiChuMiJuanData[data.id].sprite = m_sprite + this.IsFisish = true + end) + else + return this.TaiChuMiJuanData[data.id] + end +end + function this.SetSelectIndex(dataType,goodsId,b) this.selectIndex.dataType = dataType this.selectIndex.goodsId = goodsId @@ -25,6 +95,7 @@ function this.SetSelectIndex(dataType,goodsId,b) end function this.Initialize() + this.TaiChuMiJuanData = {} end function this.AddUIList(jumpId) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index df25412dc7..ff3e8e6db8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -7,6 +7,7 @@ local timer = Timer.New() -- local npc local GetCurNodeInfo = {}--当前操作层数据 -- local SkeletonGraphic--动画组件 + local isPlayerMove = false--是否在播放人物行走动画 local isAllHaveAttack = false--是否有状态不一致情况 说明不是失败过 就是未领取圣物状态 local nodeGoTable = {} @@ -241,26 +242,14 @@ function ExpeditionMainPanel:OnShowNodeData(isMoveGrid) ExpeditionMainPanel:SingleLayNodeShow(layListGrid[i],curAllLayNodeList[i]) layListGrid[i]:SetActive(true) end - if isMoveGrid then - local gridH = 2746--self.grid:GetComponent("RectTransform").sizeDelta.y - local rectH = 1656--self.grid.transform.parent:GetComponent("RectTransform").sizeDelta.y - local endH = gridH - rectH - local curlay = GetCurNodeInfo.lay - if curlay <= 6 then - local y = endH / 6 - y = endH - (curlay - 1) * y - self.grid:GetComponent("RectTransform").anchoredPosition = Vector3.New(0,y,0) - end - end - --self.ScrollView:SetData(curAllLayNodeList, function (index, go) - -- self:SingleLayNodeShow(go,curAllLayNodeList[index],(#AllLayNodeList - index) + 1) - --end) - --LogError("#AllLayNodeList - GetCurNodeInfo.lay "..#AllLayNodeList - GetCurNodeInfo.lay) - --local curIndex = #AllLayNodeList - GetCurNodeInfo.lay - --if curIndex == 0 then - -- curIndex = curIndex + 1 - --end - --self.ScrollView:SetIndex(curIndex) + local curlay = GetCurNodeInfo.lay + -- local rectH = self.grid.transform.parent:GetComponent("RectTransform").rect.height/2 + -- local y = (#curAllLayNodeList - curlay) * 183.3 + 638.55 - rectH + local rectH = self.grid.transform.parent:GetComponent("RectTransform").rect.height/2 + local y = 2746.5 - ((curlay - 1) * 183.3) - rectH; + + self.grid.transform:DOLocalMove(Vector3.New(0,y,0), 0.5, false):SetEase(Ease.Linear) + -- self.grid:GetComponent("RectTransform").anchoredPosition = Vector3.New(0,y,0) end --实例化每层信息 @@ -706,11 +695,11 @@ function ExpeditionMainPanel:PlayerMoveFun() if targetPosGoAndData.curNodeData.type == ExpeditionNodeType.Shop then NetManager.StoreNodeRequest(targetPosGoAndData.curNodeData.sortId,function () UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.Shop,targetPosGoAndData.curNodeData,3,function () - self:OnShowNodeData() + self:OnShowNodeData(true) end) end) else - self:OnShowNodeData() + self:OnShowNodeData(true) end isPlayerMove = false end, 0.8) @@ -740,7 +729,7 @@ function ExpeditionMainPanel:SelfUpdataPanelShow() end function ExpeditionMainPanel:RefreshManagerData() NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,function () - self:OnShowNodeData() + self:OnShowNodeData(true) end) end function ExpeditionMainPanel:HeroResurgence() diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index 17e8923c41..d2e460c21a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -302,11 +302,14 @@ function this.SetScrollPre(root,data,curRankType) local hurt=Util.GetGameObject(root,"Hurt"):GetComponent("Text") this.SetRankingNum(root,data.rankInfo.rank,false) + LogGreen("data.serverName:"..tostring(data.serverName)) if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then + LogGreen("data.guildName:"..tostring(data.guildName)) name.text=(data.serverName and data.serverName ~= "") and data.serverName.." "..string.format(Language[11027],data.guildName,data.rankInfo.param2) or string.format(Language[11027],data.guildName,data.rankInfo.param2) --公会名称(人数) param2 挑战人数 elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then + LogGreen("data.guildName:"..tostring(data.userName)) name.text=(data.serverName and data.serverName ~= "") and data.serverName.." "..string.format("%s",data.userName) or string.format("%s",data.userName) @@ -318,6 +321,7 @@ end function this.SetMyRank(data,curRankType) local guildData = MyGuildManager.GetMyGuildInfo() this.SetRankingNum(this.mRRank,data.rank,true) + LogYellow("data.serverName:"..tostring(data.serverName)) if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then this.mRName.text=(data.serverName and data.serverName ~= "") and data.serverName.." "..string.format(Language[11027],guildData.name,data.param2) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua index 8b9dacd52b..6659b9b99d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua @@ -123,6 +123,7 @@ function this.RefreshPanel() Util.GetGameObject(o,"Guild"):SetActive(false) Util.GetGameObject(o,"serverName"):SetActive(false) end + local colorValue = Color.New(1,1,1,0) DoTween.To( DG.Tweening.Core.DOGetter_float( function () return 0 end), @@ -189,15 +190,16 @@ function this.RefreshGuildInfo() for key, value in pairs(data) do if i==value.pathId then local guild=Util.GetGameObject(preList[i],"Guild") - local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text") + local serverDi = Util.GetGameObject(preList[i],"serverName") + local serverName=Util.GetGameObject(serverDi,"Text"):GetComponent("Text") local guildImage=guild:GetComponent("Image") local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text") - Util.GetGameObject(preList[i],"serverName"):SetActive(false) guild:SetActive(true) if value.serverName and value.serverName ~= "" then serverName.text = value.serverName + serverDi:SetActive(true) else - Util.GetGameObject(preList[i],"serverName"):SetActive(false) + serverDi:SetActive(false) serverName.text = "" end guildName.text=value.guildName diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 10f7d23c47..2c5357d3f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -664,6 +664,7 @@ function this.ExecuteLoading() function() NetManager.BeautyBagWishEquipRequest(nil,LoadingPanel.OnStep) end, function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, + function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前 -- 登录成功确认 NetManager.LoginConfimRequest() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 0dfcda8913..b1c5e0c8a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -266,6 +266,8 @@ function this:InitComponent() this.RightUp2gridSize = this.RightUp2Grid:GetComponent("RectTransform") this.jiantouObj=Util.GetGameObject(self.gameObject, "jiantouObj") + + this.taiChuMiJuanBtn = Util.GetGameObject(self.gameObject, "taichumijuan") end function this:SetPosFunc(v2) @@ -293,6 +295,59 @@ end --绑定事件(用于子类重写) function this:BindEvent() + Util.AddOnceClick(this.taiChuMiJuanBtn,function() + -- NetManager.TaiChuSecretvolumeRequest(function(msg) + -- local data = {} + -- if #msg.secretvolume < 1 then + -- LogGreen("该功能暂未开放") + -- return + -- end + -- coroutine.start(function() + + -- for k,v in ipairs(msg.secretvolume) do + -- local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + -- while(not DynamicActivityManager.GetwwwProgress()) do + -- coroutine.wait(0.01) + -- end + -- isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + -- table.insert(data,isContinue) + -- end + -- table.sort(data,function(a,b) + -- return a.id < b.id + -- end) + -- UIManager.OpenPanel(UIName.taiChuMiJuan,data) + -- end) + -- end) + ----------------------------------------------------------- 测试数据 + local data = {} + local datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"}, + [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"}, + [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"}, + [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"}, + [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"}, + [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"}, + [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"}, + [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://dfzximg01.dftoutiao.com/minimodify/20210810/640x427_611230bb2fc8e.png"}, + [9] = {id = 9,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=ef71759530174eb7a644f43a1c82fc41_s&infoId=IC003K1PNC70DBQ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-da593f41724ecf38354bb712398cfca6.jpg?time=1628672089&signature=6EABA2FF759B313F41F158D7AD8FDF6A"}, + } + coroutine.start(function() + for k,v in ipairs(datas) do + local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + local time = 0 + while(not DynamicActivityManager.GetwwwProgress()) do + coroutine.wait(0.01) + time = time + 0.01 + end + isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + table.insert(data,isContinue) + end + table.sort(data,function(a,b) + return a.id < b.id + end) + UIManager.OpenPanel(UIName.taiChuMiJuan,data) + end) + end) + Util.AddOnceClick(this.btnEndLess,function() StoryMapManager.InitData(1) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 7b0b2f3ba0..6f7fb1cb9f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5475,5 +5475,20 @@ function this.XunBaoMiZongEnterMap(func) end end) end +--请求太初秘卷 +function NetManager.TaiChuSecretvolumeRequest(func) + DynamicActivityManager.SetTaiChuMiJuanData(nil,func) --测试用 +-- local data=PlayerInfoProto_pb.TaiChuSecretvolumeRequest() +-- local msg = data:SerializeToString() +-- Network:SendMessageWithCallBack(MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_REQUEST, MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_RESPONS, msg, function(buffer) +-- local data = buffer:DataByte() +-- local msg = PlayerInfoProto_pb.TaiChuSecretvolumeResponse() +-- msg:ParseFromString(data) +-- for k,v in ipairs(msg.secretvolume) do +-- LogGreen("id:"..v.id.." strategyLink:"..v.strategyLink.." windowLink:"..v.windowLink) +-- end +-- DynamicActivityManager.SetTaiChuMiJuanData(msg,func) +-- end) +end return this \ No newline at end of file diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs index 03721caa50..9f2d7c6333 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs @@ -1,4 +1,5 @@ -using LitJson; +using GameEditor.FrameTool; +using LitJson; using System; using System.Collections; using System.Collections.Generic; @@ -22,6 +23,34 @@ namespace GameEditor.Util bool[] usedPathSelect; string[] filePath; List upLoadPathList; + [MenuItem("资源导入/协程测试")] + static void InitWindow1() + { + EditorCoroutineRunner.StartEditorCoroutine(DownLoadTempComfig()); + } + + + static IEnumerator DownLoadTempComfig() + { + string[] list = new string[] { "b_baridenglu_slogan02_en", "b_baridenglu_slogan03_en", "b_baridenglu_slogan08_en", "b_baridenglu_slogan08_zh_1_en", "b_baridenglu_sloganwuxing_en" }; + string tag2 = Environment.CurrentDirectory; + string tag3 = "Assets/ManagedResources"; + WWW www; + for (int i = 0; i < 5; i++) + { + Debug.Log("i:" + i); + string name = Path.Combine(tag2, tag3) + "/" +list[i]; + Debug.Log("name:" + name); + www = new WWW(name); + yield return www; + if (www.isDone) + { + Debug.Log("www.Texture:" + i); + } + } + yield return new WaitForSeconds(2); + Debug.Log("等待2秒"); + } [MenuItem("资源导入/资源导入")] static void InitWindow() { diff --git a/Assets/Scripts/Editor/OptTools/TextureOptTools.cs b/Assets/Scripts/Editor/OptTools/TextureOptTools.cs index 9728995179..9dfb541849 100644 --- a/Assets/Scripts/Editor/OptTools/TextureOptTools.cs +++ b/Assets/Scripts/Editor/OptTools/TextureOptTools.cs @@ -26,8 +26,10 @@ namespace LJ_OptTools var oHeight = tex.height; if (oWidth <= 0 || oHeight <= 0) return false; - var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4; - var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4; + var tarW = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2))); + var tarH = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2))); + //var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4; + //var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4; return oWidth != tarW || oHeight != tarH; } @@ -60,8 +62,11 @@ namespace LJ_OptTools #endregion //图片大小调整为4的整数倍 - var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4; - var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4; + //var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4; + //var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4; + + var tarW = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2))); + var tarH = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2))); ret.width = tarW; ret.height = tarH;