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 index 379f3af5b2..8d3fef79bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab @@ -30,12 +30,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5665718498097657906} - m_RootOrder: 0 + 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: -228} - m_SizeDelta: {x: 308.8, y: 66.900024} + 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: @@ -65,7 +65,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9d302422ae1b86d4db042878466a0a14, type: 3} + m_Sprite: {fileID: 21300000, guid: d00e57efb7a07594c914bf824ff511f4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -105,11 +105,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5665718498097657906} - m_RootOrder: 5 + 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: 70} + m_AnchoredPosition: {x: 0, y: 98.6} m_SizeDelta: {x: 140, y: 121} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4653905937005178428 @@ -191,7 +191,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &2641176296217316735 +--- !u!1 &3010540953488580419 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -199,50 +199,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6532840170437637994} - - component: {fileID: 6580297294157470566} - - component: {fileID: 9150721065308533185} + - component: {fileID: 406736504860049708} + - component: {fileID: 3185371786180165057} + - component: {fileID: 7889429126755572255} + - component: {fileID: 5836517051863684561} m_Layer: 5 - m_Name: bg + m_Name: bgDi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6532840170437637994 +--- !u!224 &406736504860049708 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2641176296217316735} + 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: 5665718498097657906} - m_RootOrder: 1 + m_Father: {fileID: 1058732650776365064} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 18.849998} - m_SizeDelta: {x: 1080, y: -82.1} + 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 &6580297294157470566 +--- !u!222 &3185371786180165057 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2641176296217316735} + m_GameObject: {fileID: 3010540953488580419} m_CullTransparentMesh: 0 ---- !u!114 &9150721065308533185 +--- !u!114 &7889429126755572255 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2641176296217316735} + m_GameObject: {fileID: 3010540953488580419} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -256,7 +257,185 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2fa524589fbed3f4b837e9048f3268e3, type: 3} + 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 @@ -295,6 +474,7 @@ RectTransform: 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 @@ -401,11 +581,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1058732650776365064} - {fileID: 5333837363576207506} - - {fileID: 6532840170437637994} - {fileID: 8329884962036650588} - - {fileID: 1915107041368105942} - - {fileID: 292383046426468324} - {fileID: 3086266629382961749} m_Father: {fileID: 838045334281417467} m_RootOrder: 1 @@ -445,12 +623,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8329884962036650588} - m_RootOrder: 0 + 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_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: @@ -554,7 +732,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 257157e8ec94c2740b06e7dbcf83ec4a, type: 3} + m_Sprite: {fileID: 21300000, guid: e5174d678f0c29d4b807e5fae001249f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -575,7 +753,7 @@ GameObject: - component: {fileID: 4577208638755532487} - component: {fileID: 947173779260489847} m_Layer: 5 - m_Name: Image + m_Name: mask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -588,18 +766,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7311530429622308950} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4 + m_Father: {fileID: 1058732650776365064} + 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: 249.14996} - m_SizeDelta: {x: 0, y: 237} - m_Pivot: {x: 0.5, y: 0.5} + 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 @@ -770,9 +948,9 @@ RectTransform: m_Father: {fileID: 1915107041368105942} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000045178225} + m_AnchoredPosition: {x: 0, y: 0.000004099007} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &921486100088032325 @@ -790,10 +968,10 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 71 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 23.12 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -838,18 +1016,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8477601868341582866} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 5665718498097657906} - m_RootOrder: 3 + 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.000030517578, y: -101.4} - m_SizeDelta: {x: -52, y: -464.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: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 7a0dcb9e06..fb0e29b03e 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,16 +7115,53 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1174661642300151069} - - {fileID: 165462485454605335} - {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: -126.2, y: 0} + m_SizeDelta: {x: 252.3, y: 0} + m_Pivot: {x: 0.5, 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: 185 + m_ChildAlignment: 8 + m_Spacing: 0 + 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 @@ -23544,86 +23583,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3290581571341680777 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4436682208234571280} - - component: {fileID: 4989471084640905570} - - component: {fileID: 1058585905630376709} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4436682208234571280 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3290581571341680777} - 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: 8610578578341240162} - 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.6, y: -49.5} - m_SizeDelta: {x: 117.76, y: 65.64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4989471084640905570 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3290581571341680777} - m_CullTransparentMesh: 0 ---- !u!114 &1058585905630376709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3290581571341680777} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.972549, g: 0.92156863, b: 0.6039216, 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 34 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u9E3F\u8499\u9635" - LanguageIndex: 11043 --- !u!1 &3300957038709117867 GameObject: m_ObjectHideFlags: 0 @@ -55350,81 +55309,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &4606029363333020353 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8610578578341240162} - - component: {fileID: 4625011769835081925} - - component: {fileID: 5163185205032399117} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8610578578341240162 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4606029363333020353} - 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: 4436682208234571280} - 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: -1, y: 0.6} - m_SizeDelta: {x: 190, y: 177.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4625011769835081925 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4606029363333020353} - m_CullTransparentMesh: 0 ---- !u!114 &5163185205032399117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4606029363333020353} - 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: f0101b6daf626ec43ac8a7420f07cdc2, 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 &4634373770221080592 GameObject: m_ObjectHideFlags: 0 @@ -61264,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: @@ -67016,7 +66900,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ce6a5e8caebae894bbb7d3eeb17e8dcb, type: 3} + m_Sprite: {fileID: 21300000, guid: d273621ae1575f84893d25220619a4e0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -70817,15 +70701,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 119690817069795584} - - {fileID: 8610578578341240162} - {fileID: 998803897713680703} m_Father: {fileID: 7019400324678272696} - m_RootOrder: 2 + m_RootOrder: 1 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: 372.80002} - 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 &4144326890380073377 CanvasRenderer: @@ -85779,7 +85662,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7679659585813988529} - m_RootOrder: 2 + 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} diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua index 5831913f5f..572f484577 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua @@ -12,7 +12,7 @@ function TaiChuMiJuanPanel:InitComponent() this.itemPre = Util.GetGameObject(this.btnRoot, "itemPre") this.title = Util.GetGameObject(this.btnRoot, "title") - this.grid = Util.GetGameObject(this.btnRoot, "circle/root") + this.grid = Util.GetGameObject(this.btnRoot, "bg/circle/root") this.backBtn = Util.GetGameObject(this.btnRoot, "backBtn") this.itemPres = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index c8d7130a3d..51dd44d827 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -19,19 +19,19 @@ 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 + ---------------------------------------------测试数据 + 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 345e8483f5..b347de8b60 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -296,13 +296,42 @@ end --绑定事件(用于子类重写) function this:BindEvent() Util.AddOnceClick(this.taiChuMiJuanBtn,function() - NetManager.TaiChuSecretvolumeRequest(function(msg) + -- NetManager.TaiChuSecretvolumeRequest(function(msg) + -- local data = {} + -- 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(msg.secretvolume) do + 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) @@ -312,35 +341,6 @@ function this:BindEvent() 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() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 339cd83b29..c2ab24ba6a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5464,18 +5464,18 @@ 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) + 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