diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan.png b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan.png new file mode 100644 index 0000000000..b6483f8fe5 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan.png differ diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan.png.meta b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan.png.meta new file mode 100644 index 0000000000..649ad95b80 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ad74cc4bf6ddf964da59cae5c22f8db7 +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: aeea5c0046f518a45a68d6ffe1ff6f69 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ContinuePackageAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan2.png b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan2.png new file mode 100644 index 0000000000..a6750bf738 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan2.png differ diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan2.png.meta b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan2.png.meta new file mode 100644 index 0000000000..1eb9eb1bf0 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_30yuan2.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f5746be0f92cf8d439a1fed5a2de3499 +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: b9365ae6394e4cb45a14622191ac98de + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ContinuePackageAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan.png b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan.png new file mode 100644 index 0000000000..6f75014368 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan.png differ diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan.png.meta b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan.png.meta new file mode 100644 index 0000000000..b69c98131a --- /dev/null +++ b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 079a34763c9adba43b6bfca31fba610e +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: 3840411e887c5404fbafd597631f3143 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ContinuePackageAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan2.png b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan2.png new file mode 100644 index 0000000000..a62ecd22d9 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan2.png differ diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan2.png.meta b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan2.png.meta new file mode 100644 index 0000000000..1d1a95f4a3 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_6yuan2.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: cb95dd1ce757a2242a391d75dc7809be +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: fb3ff37dcd207d443b59c2c872491d5f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ContinuePackageAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_diban.png b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_diban.png new file mode 100644 index 0000000000..15ddd26d95 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_diban.png differ diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_diban.png.meta b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_diban.png.meta new file mode 100644 index 0000000000..0d03cec735 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_diban.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 668464dee75df9c4d9550b71b5d07306 +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: c4feed2a411164c48bd25ad26b518296 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ContinuePackageAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_tubiao.png b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_tubiao.png new file mode 100644 index 0000000000..dea7a313c0 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_tubiao.png differ diff --git a/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_tubiao.png.meta b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_tubiao.png.meta new file mode 100644 index 0000000000..eef805c412 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ContinuePackageAtlas/c_czfl_tubiao.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d21bff1aaf754fc4ea7b25eeb4d04d79 +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: 00c3a8a1a11bebf439829c2efe3c630d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ContinuePackageAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab index cd1c7fb849..68c546f035 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 5720075157619710336} - component: {fileID: 5324488390377574465} - - component: {fileID: 5644428717338010576} + - component: {fileID: 7178026181276997268} m_Layer: 0 m_Name: Image m_TagString: Untagged @@ -34,7 +34,7 @@ RectTransform: 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_AnchoredPosition: {x: -2.6, y: 5} m_SizeDelta: {x: 202, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5324488390377574465 @@ -45,7 +45,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 220408863314720761} m_CullTransparentMesh: 0 ---- !u!114 &5644428717338010576 +--- !u!114 &7178026181276997268 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -54,26 +54,32 @@ MonoBehaviour: m_GameObject: {fileID: 220408863314720761} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9843138, g: 0.9333334, b: 0.7490196, 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: bd028a97b0694644abac55ed3e3ce248, 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 + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 48 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u8D85\u503C\u8FD4\u5229" + LanguageIndex: 0 --- !u!1 &668515550640612316 GameObject: m_ObjectHideFlags: 0 @@ -108,9 +114,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -34.4} + m_AnchoredPosition: {x: 0, y: -81.4} m_SizeDelta: {x: 82, y: 0} - m_Pivot: {x: 0, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &6888631392110526536 MonoBehaviour: m_ObjectHideFlags: 0 @@ -143,7 +149,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: -8 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -257,8 +263,8 @@ RectTransform: 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: -89.1, y: -22.8} - m_SizeDelta: {x: 498.3, y: 104.4} + m_AnchoredPosition: {x: -102.71, y: -52.2} + m_SizeDelta: {x: 440, y: 104.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7213273430475869332 MonoBehaviour: @@ -273,7 +279,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 30 + m_Left: 0 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -281,7 +287,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 150, y: 150} - m_Spacing: {x: 0, y: 0} + m_Spacing: {x: -56.77, y: 0} m_Constraint: 2 m_ConstraintCount: 1 --- !u!222 &3538770538659127874 @@ -432,14 +438,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7121277092858204037} - - {fileID: 3096561829796132154} + - {fileID: 2545290923758964436} - {fileID: 327719872794192258} m_Father: {fileID: 2750471745573935426} m_RootOrder: 4 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: -428.83, y: 33} + m_AnchoredPosition: {x: -458, y: 36} m_SizeDelta: {x: 81.84, y: 657.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2407937911512814976 @@ -494,7 +500,7 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2848594445156506062 +--- !u!1 &2937959955895347159 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -502,9 +508,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7369716692160020052} - - component: {fileID: 2122542296497948848} - - component: {fileID: 5107364236416893536} + - component: {fileID: 6883153514917663980} + - component: {fileID: 4233011639035538807} + - component: {fileID: 8342674694801574286} m_Layer: 0 m_Name: bgline m_TagString: Untagged @@ -512,40 +518,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7369716692160020052 +--- !u!224 &6883153514917663980 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2848594445156506062} + m_GameObject: {fileID: 2937959955895347159} 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: 3096561829796132154} + m_Father: {fileID: 2545290923758964436} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 41, y: 2.1500244} + m_AnchoredPosition: {x: 40.04, y: -8.7} m_SizeDelta: {x: 4, y: 22} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2122542296497948848 +--- !u!222 &4233011639035538807 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2848594445156506062} + m_GameObject: {fileID: 2937959955895347159} m_CullTransparentMesh: 0 ---- !u!114 &5107364236416893536 +--- !u!114 &8342674694801574286 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2848594445156506062} + m_GameObject: {fileID: 2937959955895347159} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -772,7 +778,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &3540358020388305728 +--- !u!1 &3531134784355024491 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -780,77 +786,204 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7555205745544236577} - - component: {fileID: 1350724166900821077} - - component: {fileID: 4933204781977023458} + - component: {fileID: 2545290923758964436} + - component: {fileID: 3023659987410006798} + - component: {fileID: 4125917549792040628} + - component: {fileID: 6889442208282072337} + - component: {fileID: 7887960827525776312} m_Layer: 0 - m_Name: title + m_Name: tab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7555205745544236577 +--- !u!224 &2545290923758964436 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3540358020388305728} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 3531134784355024491} + 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: 3096561829796132154} - m_RootOrder: 3 + m_Children: + - {fileID: 6883153514917663980} + - {fileID: 1052084151771884818} + - {fileID: 7944016472393893859} + - {fileID: 3435773343199518887} + m_Father: {fileID: 5560347858770598648} + 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: 0, y: 0} - m_SizeDelta: {x: 36, y: 126} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -499.7, y: -207.64} + m_SizeDelta: {x: 82, y: 213.29} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1350724166900821077 +--- !u!222 &3023659987410006798 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3540358020388305728} + m_GameObject: {fileID: 3531134784355024491} m_CullTransparentMesh: 0 ---- !u!114 &4933204781977023458 +--- !u!114 &4125917549792040628 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3540358020388305728} + m_GameObject: {fileID: 3531134784355024491} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 7887960827525776312} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &6889442208282072337 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3531134784355024491} + 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!114 &7887960827525776312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3531134784355024491} + 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: 0.8113208, g: 0.6792783, b: 0.28315097, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "6\u5143" +--- !u!1 &3735146837288898138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1052084151771884818} + - component: {fileID: 2352292072782719741} + - component: {fileID: 2229439863130240911} + m_Layer: 0 + m_Name: bgdi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1052084151771884818 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735146837288898138} + 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: 2545290923758964436} + 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: -0.96, y: -6.8225} + m_SizeDelta: {x: 83.92, y: 199.65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2352292072782719741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735146837288898138} + m_CullTransparentMesh: 0 +--- !u!114 &2229439863130240911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735146837288898138} + 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: 2aaa6456430fe044b9979521c30bb14f, 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 &3809056722976676371 GameObject: m_ObjectHideFlags: 0 @@ -931,7 +1064,7 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u5929\u6570" LanguageIndex: 0 ---- !u!1 &4294569554244289207 +--- !u!1 &4443094100478544991 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -939,50 +1072,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6828526214546953615} - - component: {fileID: 5613861276029052902} - - component: {fileID: 605815557394438501} + - component: {fileID: 3435773343199518887} + - component: {fileID: 549809947640282916} + - component: {fileID: 2480746726722142771} m_Layer: 0 - m_Name: bgdi + m_Name: title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6828526214546953615 +--- !u!224 &3435773343199518887 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4294569554244289207} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 4443094100478544991} + 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: 3096561829796132154} - m_RootOrder: 1 + m_Father: {fileID: 2545290923758964436} + m_RootOrder: 3 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: 82, y: 186} + m_AnchoredPosition: {x: -0.96, y: -2.6} + m_SizeDelta: {x: 42, y: 76} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5613861276029052902 +--- !u!222 &549809947640282916 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4294569554244289207} + m_GameObject: {fileID: 4443094100478544991} m_CullTransparentMesh: 0 ---- !u!114 &605815557394438501 +--- !u!114 &2480746726722142771 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4294569554244289207} + m_GameObject: {fileID: 4443094100478544991} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -990,13 +1123,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + 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: 2aaa6456430fe044b9979521c30bb14f, type: 3} + m_Sprite: {fileID: 21300000, guid: cb95dd1ce757a2242a391d75dc7809be, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1043,8 +1176,8 @@ RectTransform: 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: 7.050012, y: 1790.1} - m_SizeDelta: {x: 750, y: 200} + m_AnchoredPosition: {x: -0.000021935, y: 1858} + m_SizeDelta: {x: 724.04, y: 182.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &277297546801486428 CanvasRenderer: @@ -1118,7 +1251,7 @@ RectTransform: 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: 374.5} + m_AnchoredPosition: {x: -0.000012398, y: 348.8} m_SizeDelta: {x: 302, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6506979086108423105 @@ -1192,7 +1325,7 @@ RectTransform: 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: 9.675, y: 52.2} + m_AnchoredPosition: {x: 26.8, y: 47.5} m_SizeDelta: {x: 695.85, y: 45.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7118307101639335013 @@ -1216,7 +1349,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.2784314, g: 0.19215688, b: 0.21960786, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1236,7 +1369,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: "\u7D2F\u8BA1\u5145\u503C" LanguageIndex: 0 --- !u!1 &6121961578120532490 GameObject: @@ -1333,6 +1466,80 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &6448553166763535520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7944016472393893859} + - component: {fileID: 4741744585942726438} + - component: {fileID: 7214240648007400986} + m_Layer: 0 + m_Name: select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7944016472393893859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6448553166763535520} + 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: 2545290923758964436} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.96, y: -8.63} + m_SizeDelta: {x: 88.71, y: 203.25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4741744585942726438 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6448553166763535520} + m_CullTransparentMesh: 0 +--- !u!114 &7214240648007400986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6448553166763535520} + 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: 9c58f94f924c5594fbff6700d623c4fb, 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 &6605752224547364992 GameObject: m_ObjectHideFlags: 0 @@ -1344,7 +1551,6 @@ GameObject: - component: {fileID: 2750471745573935426} - component: {fileID: 2408724274248282544} - component: {fileID: 4186834828861366246} - - component: {fileID: 8764843228838812777} m_Layer: 0 m_Name: Bg m_TagString: Untagged @@ -1404,7 +1610,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: 37e7febf99592a240bcd58c2520699c6, type: 3} + m_Sprite: {fileID: 21300000, guid: 668464dee75df9c4d9550b71b5d07306, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1413,61 +1619,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &8764843228838812777 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6605752224547364992} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenSequeue: - - initV3: {x: 0, y: -600, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: 0, y: 0, z: 0} - changeFloat: 0 - duration: 1 - delay: 0 - curveType: 0 - changeType: 0 - sequeueType: 0 - loop: 0 - loopType: 0 - targetObj: {fileID: 2750471745573935426} - - initV3: {x: 0, y: 0, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: 0, y: 0, z: 0} - changeFloat: 1 - duration: 1 - delay: 0 - curveType: 0 - changeType: 8 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 2750471745573935426} - - initV3: {x: 0, y: 0, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: 0, y: 0, z: 0} - changeFloat: 1 - duration: 1 - delay: 0 - curveType: 0 - changeType: 6 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 2750471745573935426} - isPlayAudio: 1 - isHaveCloseBtn: 0 - isPlayOnOpen: 1 --- !u!1 &6704220996341576606 GameObject: m_ObjectHideFlags: 0 @@ -1505,8 +1656,8 @@ RectTransform: 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: 265, y: -1.5} - m_SizeDelta: {x: 190, y: 70} + m_AnchoredPosition: {x: 221.89, y: 4.08} + m_SizeDelta: {x: 209.19, y: 79.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8407601103703489248 CanvasRenderer: @@ -1536,7 +1687,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: 98b646746e686b6438555ec8552ecc60, type: 3} + m_Sprite: {fileID: 21300000, guid: 0a532ebdeed70794ab64fbeb4b884ca1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1639,8 +1790,8 @@ RectTransform: 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: 4.7, y: -156.5} - m_SizeDelta: {x: 745.3, y: 868.6} + m_AnchoredPosition: {x: 4.5, y: -184.6} + m_SizeDelta: {x: 754.2, y: 834.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6588532141008816022 CanvasRenderer: @@ -1685,7 +1836,7 @@ RectTransform: 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: -700} + m_AnchoredPosition: {x: -48, y: -683} m_SizeDelta: {x: 700, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7805140256559782348 @@ -1725,212 +1876,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8093528655009612423 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4069429427725204656} - - component: {fileID: 671552640290369798} - - component: {fileID: 599655557190839115} - m_Layer: 0 - m_Name: select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4069429427725204656 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8093528655009612423} - 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: 3096561829796132154} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 82, y: 186} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &671552640290369798 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8093528655009612423} - m_CullTransparentMesh: 0 ---- !u!114 &599655557190839115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8093528655009612423} - 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: 9c58f94f924c5594fbff6700d623c4fb, 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 &8169508902378720173 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3096561829796132154} - - component: {fileID: 8949058207455984782} - - component: {fileID: 7690998629941228297} - - component: {fileID: 3343712145607383157} - - component: {fileID: 4308912213800360287} - m_Layer: 0 - m_Name: tab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3096561829796132154 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8169508902378720173} - 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: 7369716692160020052} - - {fileID: 6828526214546953615} - - {fileID: 4069429427725204656} - - {fileID: 7555205745544236577} - m_Father: {fileID: 5560347858770598648} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -929, y: -227} - m_SizeDelta: {x: 82, y: 186} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8949058207455984782 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8169508902378720173} - m_CullTransparentMesh: 0 ---- !u!114 &7690998629941228297 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8169508902378720173} - 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: 4308912213800360287} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &3343712145607383157 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8169508902378720173} - 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!114 &4308912213800360287 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8169508902378720173} - 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 &8209275484319792147 GameObject: m_ObjectHideFlags: 0 @@ -1990,7 +1935,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.91764706, b: 0.67058825, a: 1} + m_Color: {r: 0.3254902, g: 0.11764707, b: 0.039215688, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab index 2cf01b0c6f..4440ef2ead 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab @@ -92880,7 +92880,7 @@ RectTransform: 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: 96, y: 0.4} + m_AnchoredPosition: {x: 0, y: 0.4} m_SizeDelta: {x: 107.85, y: 56.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8764074801730209442 @@ -93689,7 +93689,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6641355013762756751} - - {fileID: 6377216238457996308} m_Father: {fileID: 4878749898380413223} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -114384,86 +114383,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &4952204435033591498 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6377216238457996308} - - component: {fileID: 1083858229806448804} - - component: {fileID: 6554060041256509367} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6377216238457996308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4952204435033591498} - 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: 1610881453404676211} - 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: -71.5, y: -0.4} - m_SizeDelta: {x: 187.29, y: 56.43} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1083858229806448804 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4952204435033591498} - m_CullTransparentMesh: 0 ---- !u!114 &6554060041256509367 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4952204435033591498} - 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.95686275, g: 0.8509804, b: 0.5411765, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5DF2\u5145\u503C\uFF1A" - LanguageIndex: 0 --- !u!1 &5013346909467081173 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index b3eff4af8b..10e8f352e6 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1430,6 +1430,7 @@ GoodsTypeDef = { QiJieMiBao=40,--天宫秘宝 RecruiteTreasure = 16, MeiRiTeHui = 17, + chaozhifanli = 18, } --工坊功能类型 diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index d8fe1e7f2e..b190fc7353 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -436,6 +436,7 @@ UIName = { ContinuePackagePanel = 442, -- 连购礼包new ArenaTrialPanel = 445, SupremeHeroPopupNew = 448, + PremiumRebatePanel = 449, } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index 40794332d1..1649077fae 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -6,60 +6,60 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) local TabBox = require("Modules/Common/TabBox") -local tabs = {} local BTNS = { - [1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "6\n元",showType = 48,actType = ActivityTypeDef.chaozhifanli}, - [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "30\n元",showType = 49,actType = ActivityTypeDef.chaozhifanli30}, + [1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_6yuan",text2 = "c_czfl_6yuan2",showType = 48,actType = ActivityTypeDef.chaozhifanli,goodsType = GoodsTypeDef.chaozhifanli}, + [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_30yuan",text2 = "c_czfl_30yuan2",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli}, } local curPage = 1 function PremiumRebatePanel:InitComponent() - self.spLoader = SpriteLoader.New() - self.backBtn = Util.GetGameObject(self.gameObject, "closeBtn") - self.itemPre = Util.GetGameObject(self.gameObject, "Bg/ItemPre") - self.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll") - self.leftTime = Util.GetGameObject(self.gameObject, "Bg/time"):GetComponent("Text") - self.tabbox = Util.GetGameObject(self.gameObject, "bg/tabbox") + this.spLoader = SpriteLoader.New() + this.backBtn = Util.GetGameObject(self.gameObject, "closeBtn") + this.itemPre = Util.GetGameObject(self.gameObject, "Bg/ItemPre") + this.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll") + this.leftTime = Util.GetGameObject(self.gameObject, "Bg/time/leftTime"):GetComponent("Text") + this.tabbox = Util.GetGameObject(self.gameObject, "Bg/tabbox") - local rootHight = self.scrollItem.transform.rect.height - local width = self.scrollItem.transform.rect.width - self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform, - self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, -5)) - self.scrollView.moveTween.MomentumAmount = 1 - self.scrollView.moveTween.Strength = 2 - self.scrollView.elastic = false + local rootHight = this.scrollItem.transform.rect.height + local width = this.scrollItem.transform.rect.width + this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform, + this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 15)) + this.scrollView.moveTween.MomentumAmount = 1 + this.scrollView.moveTween.Strength = 2 + this.scrollView.elastic = false - self.itemViewList = {} - self.sortingOrder = 0 + this.itemViewList = {} + this.sortingOrder = 0 end --绑定事件(用于子类重写) function PremiumRebatePanel:BindEvent() - Util.AddOnceClick(self.backBtn, function() - self:ClosePanel() + Util.AddOnceClick(this.backBtn, function() + this:ClosePanel() end) -- 初始化Tab管理器 - self.PageTabCtrl = TabBox.New() - self.PageTabCtrl:SetTabAdapter(self.PageTabAdapter) - self.PageTabCtrl:SetTabIsLockCheck(self.PageTabIsLockCheck) - self.PageTabCtrl:SetChangeTabCallBack(self.OnPageTabChange) + this.PageTabCtrl = TabBox.New() + this.PageTabCtrl:SetTabAdapter(this.PageTabAdapter) + this.PageTabCtrl:SetTabIsLockCheck(this.PageTabIsLockCheck) + this.PageTabCtrl:SetChangeTabCallBack(this.OnPageTabChange) end -function PremiumRebatePanel.PageTabAdapter(tab, index, status) +function this.PageTabAdapter(tab, index, status) local select = Util.GetGameObject(tab, "select") - local title = Util.GetGameObject(tab, "title"):GetComponent("Text") - title.text = self.spLoader:LoadSprite(BTNS[index].text1) + local title = Util.GetGameObject(tab, "title"):GetComponent("Image") if status == "select" then select.gameObject:SetActive(true) + title.sprite = this.spLoader:LoadSprite(BTNS[index].text1) else select.gameObject:SetActive(false) + title.sprite = this.spLoader:LoadSprite(BTNS[index].text2) end end -function PremiumRebatePanel.PageTabIsLockCheck() - return true +function this.PageTabIsLockCheck() + return false end -function PremiumRebatePanel.OnPageTabChange(index) +function this.OnPageTabChange(index) if curPage == index then return end @@ -69,51 +69,51 @@ end --添加事件监听(用于子类重写) function PremiumRebatePanel:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.OnShow,self) + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,this.OnShow,self) end --移除事件监听(用于子类重写) function PremiumRebatePanel:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.OnShow,self) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,this.OnShow,self) end function PremiumRebatePanel:OnSortingOrderChange() - end --界面打开时调用(用于子类重写) function PremiumRebatePanel:OnOpen() - + curPage = 1 end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function PremiumRebatePanel:OnShow() - curPage = 1 - self:Refresh(true,true) + this:Refresh(true,true) + this.PageTabCtrl:Init(this.tabbox.gameObject, BTNS,curPage) end function PremiumRebatePanel:Refresh(isTop,isAni) - self.actData = ActivityGiftManager.GetActivityInfo(BTNS[curPage].actType) - self.giftData = DynamicActivityManager.GetGiftDataByType({DataType.Direct,5,BTNS[curPage].showType}) - self.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",BTNS[curPage].actType) - for i = 1,#self.actData.mission do - if self.actData.mission[self.actData.mission[1].progress].state == 1 then - self.leftTime.text = string.format("累计天数:%s/15",self.actData.mission[1].progress) - else - self.leftTime.text = string.format("累计天数:%s/15",self.actData.mission[1].progress - 1) - end + --value 累计充值天数 昨天 ,, + this.actData = ActivityGiftManager.GetActivityTypeInfo(BTNS[curPage].actType) + this.giftData = DynamicActivityManager.GetGiftDataByType({{DataType.Direct,BTNS[curPage].goodsType,BTNS[curPage].showType}}) + this.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",this.actData.activityId) + local missionConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityRewardConfig,"ActivityId",this.actData.activityId,"Sort",this.actData.value + 1) + local missionData = ActivityGiftManager.GetActivityInfo(this.actData.activityId,missionConfig.Id) + if missionData.state == 1 then + this.leftTime.text = string.format("累计天数:%s/15",this.actData.value + 1) + else + this.leftTime.text = string.format("累计天数:%s/15",this.actData.value) end - - self:SetRewardShow(isTop,isAni) - self:SetTime() + + this:SetRewardShow(isTop,isAni) + this:SetTime() end function PremiumRebatePanel:SetRewardShow(isTop,isAni) -- 显示 - self.scrollView:SetData(self.giftData, function (index, item) - self:ShowSingleHero(item, self.giftData[index],index) + this.scrollView:SetData(this.giftData, function (index, item) + this:ShowSingleHero(item, this.giftData[index],index) end,not isTop,not isAni) - self.scrollView:SetIndex(self.actData.mission[1].progress) + this.scrollView:SetIndex(this.actData.value + 1) end function PremiumRebatePanel:ShowSingleHero(go,_data,index) @@ -122,37 +122,31 @@ function PremiumRebatePanel:ShowSingleHero(go,_data,index) local btnGet = Util.GetGameObject(go, "btnGet") local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text") local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image") - local obj = Util.GetGameObject(btnGet, "Obj") - local icon = Util.GetGameObject(obj, "icon"):GetComponent("Image") - local cost = Util.GetGameObject(obj, "cost"):GetComponent("Text") - local missionConfigData = self.actConfigData[(curPage - 1)*15 + index] + local missionConfigData = this.actConfigData[index] title.text = missionConfigData.ContentsShow - if not self.itemViewList[go] then - self.itemViewList[go] = {} + if not this.itemViewList[go] then + this.itemViewList[go] = {} end - for k,v in ipairs(self.itemViewList[go]) do + for k,v in ipairs(this.itemViewList[go]) do v.gameObject:SetActive(false) end for i = 1, #_data.data.shows do - if not self.itemViewList[go][i] then - self.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,self.grid.transform) - self.itemViewList[go][i].gameObject:SetActive(false) + if not this.itemViewList[go][i] then + this.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,grid.transform) + this.itemViewList[go][i].gameObject:SetActive(false) end - self.itemViewList[go][i]:OnOpen(false, {_data.data.shows[i][1],_data.data.shows[i][2],_data.data.shows[i][3]}, 0.9,false,false,false,self.sortingOrder) - self.itemViewList[go][i].gameObject:SetActive(true) + this.itemViewList[go][i]:OnOpen(false, {_data.data.shows[i][1],_data.data.shows[i][2],_data.data.shows[i][3]}, 0.65,false,false,false,this.sortingOrder) + this.itemViewList[go][i].gameObject:SetActive(true) end btnText.gameObject:SetActive(true) - btnText.text = string.format("%s 元",_data.data.price) - local missionData = self.actData.mission[(curPage - 1)*15 + index] - if missionData.state == 0 and index == missionData.progress then + btnText.text = _data.data.price + local missionData = ActivityGiftManager.GetActivityInfo(this.actData.activityId,missionConfigData.Id) + if missionData.state == 0 and index == this.actData.value + 1 then Util.SetGray(btnGet,false) Util.AddOnceClick(btnGet,function () PayManager.Pay(_data.data.shopData.goodsId, function(id) FirstRechargeManager.RefreshAccumRechargeValue(_data.data.shopData.goodsId) OperatingManager.SetHadBuyGoodsId({_data.data.shopData.goodsId}) - missionData.state = 0 - self:ShowSingleHero(go,_data,index) - self:Refresh(false,false) end) end) elseif missionData.state == 1 then @@ -160,7 +154,9 @@ function PremiumRebatePanel:ShowSingleHero(go,_data,index) btnText.text = "已购买" else Util.SetGray(btnGet,true) - PopupTipPanel.ShowTip("累计购买X天后才可购买!") + Util.AddOnceClick(btnGet,function () + PopupTipPanel.ShowTip("累计购买X天后才可购买!") + end) end end @@ -173,8 +169,8 @@ end --界面销毁时调用(用于子类重写) function PremiumRebatePanel:OnDestroy() - self.spLoader:Destroy() - self.itemViewList = {} + this.spLoader:Destroy() + this.itemViewList = {} end return PremiumRebatePanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 137fb7a3df..fcdc967432 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1071,6 +1071,8 @@ function this:TabBtnAction(id,actType,data) end) elseif id == ActivityTypeDef.jingjishilian then UIManager.OpenPanel(UIName.ArenaTrialPanel) + elseif id == ActivityTypeDef.chaozhifanli then + UIManager.OpenPanel(UIName.PremiumRebatePanel) end elseif actType == 2 then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua index d4eaaf54c5..47b14fe59a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua @@ -431,7 +431,7 @@ end function this.SetButtonState() local color = this.money < activityConfig[idList[curPage][#idList[curPage]].id].Values[1][1] and "#FF0000FF" or "#F4D98AFF" - this.taskProgress.text = string.format(" %s/%s", color, this.money,activityConfig[idList[curPage][#idList[curPage]].id].Values[1][1]) + this.taskProgress.text = string.format("已充值:%s/%s", color, this.money,activityConfig[idList[curPage][#idList[curPage]].id].Values[1][1]) end function this.RefreshRedPoint(indexType)