勇冠三军,叱咤风云活动添加

dev_chengFeng
gaoxin 2020-09-24 17:26:27 +08:00 committed by JieLing
parent e9159cc1ca
commit 7b7def3f8f
45 changed files with 7901 additions and 578 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 80ada0e23a757a24983c45edefa558a5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 692 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 9459ca7b88562664f80c661cf1ce0cca
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: 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: b37f21c46f877124b8e1261282c17a5a
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: d7c8ed15b405d5c47a449b24210d447f
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: 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: 8907060872721a3419b0b53366e19c2b
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 1c3efb4a31c432c4cb580bc0bd4be7af
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: 58
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: 070146339935fd844bfc4c4e32418907
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 669040eddf4bbda4a9edecae90e7a6f6
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: 58
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: 4ce3048e36f35414b923b699a23d18de
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: d0340e6a3e4f916478c1cf98bde893ac
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: 58
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: 428e05be144eb2847b9933cfefabbc9d
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: fc1d0aef840ee714689dd2af70e35758
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: 58
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: 7aa1c086f1889b245aec1d11088f8b94
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: b03c70aa13178e943b1d5c3f0cae99f1
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: 58
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: 5b4748c2d0bb076439a9c6ca08b046f9
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: a91544c62f0ce22438507ef0dd8672bd
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: 58
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: b6862e8468826294884032bcfc4403bb
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 4ea7aae2650146c4098d24d9782219f1
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: 58
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: 3124b0fc8283a504ab5e86f9c028d79f
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 90842bf6181eecd4e868f53635fe780a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 887 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 9666adb572f143e48be284b69c0687dc
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: 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: feb3f5bea7051c54e8603ee742d862c1
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 7f05175df0fe76344b6e5292ad6c9867
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: 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: a34030399f4658848ab01d6c57d386dd
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
alignment: 0

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0

View File

@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
@ -95,12 +95,12 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2

View File

@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
@ -95,12 +95,12 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2

View File

@ -106,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/bg/ipad_left
assetBundleVariant: unity3d

View File

@ -7,6 +7,7 @@ Shader "CGwell FX/Additive Lv1"
_TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5)
_MainTex ("Particle Texture (A = Transparency)", 2D) = "white" {}
_InvFade ("Soft Particles Factor", Range(0.01,3.0)) = 1.0
_Stencil("Stencil ID", Float) = 0
}
Category {
@ -17,6 +18,11 @@ Shader "CGwell FX/Additive Lv1"
"RenderType" = "Transparent"
}
/*Stencil {
Ref[_Stencil]
Comp equal
}*/
Blend SrcAlpha One
AlphaTest Greater .01
ColorMask RGB

View File

@ -10,6 +10,7 @@ Shader "Custom/S_03_UV_alpha_add" {
_U ("U", Float ) = 0.2
_V ("V", Float ) = 0.7
_Mask ("Mask", 2D) = "white" {}
_Stencil("Stencil ID", Float) = 0
}
SubShader {
Tags {
@ -17,6 +18,11 @@ Shader "Custom/S_03_UV_alpha_add" {
"Queue"="Transparent"
"RenderType"="Transparent"
}
/*Stencil {
Ref[_Stencil]
Comp equal
Pass keep
}*/
Pass {
Name "FORWARD"
Tags {

View File

@ -46,7 +46,7 @@ function ActivityDetail:OnShow()
self.content.text= str
local str2
--判断抽取的类型
if panelType == 1 then--破阵诛仙
if panelType == 1 then--限时召唤
self:ReFreshUpHero()
self:RefreshHeroRate()
str2=ActivityGiftManager.GetTimeStartToEnd(ActivityTypeDef.FindFairy)

View File

@ -3,41 +3,66 @@ local DynamicActivityPanel = Inherit(BasePanel)
local this = DynamicActivityPanel
-- Tab管理器
local TabBox = require("Modules/Common/TabBox")
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
this._CurPageIndex =1
local orginLayer
local _PageInfo = {--后期可以做成tableInserticon名字都去读表
local tabs = {
[1] = { --破阵诛仙
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
},
[2] = { --限时召唤
[2] = { --勇冠三军
default = "c_ydsj_anniu_02", lock = "c_ydsj_anniu_02", select = "c_ydsj_anniu_01",
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
},
[3] = { --叱咤风云
default = "c_ccfy_icon2", lock = "c_ccfy_icon2", select = "c_ccfy_icon1",
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
},
[4] = { --限时召唤
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,ActType = ActivityTypeDef.FindFairy
},
[3] = { --乾坤宝盒
[5] = { --乾坤宝盒
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,ActType = ActivityTypeDef.QianKunBox
},
[4] = { --珍奇礼包
[6] = { --珍奇礼包
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
rpType = "",panelType = PanelType.Main,
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_Treasure
},
[5] = { --累计充值
[7] = { --累计充值
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.PoZhenZhuXianRecharge,panelType = PanelType.Main,
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge
},
[6] = { --限时商市
[8] = { --限时商市
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
rpType = "",panelType = PanelType.Main,
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop
},
[9] = { --限时兑换
default = "r_xianshiduihuan_anniu_01", lock = "r_xianshiduihuan_anniu_01", select = "r_xianshiduihuan_anniu",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LimitExchange
},
}
local _PageInfo = {--后期可以做成tableInserticon名字都去读表
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 2,
[5] = 3,
[6] = 4,
[7] = 5,
[8] = 6,
[9] = 7,
}
local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall")
local QianKunBox = require("Modules/DynamicActivity/QianKunBox")
local PoZhenZhuXianPage=require("Modules/DynamicActivity/PoZhenZhuXianPage")
local DynamicActPage=require("Modules/DynamicActivity/DynamicTaskPage")
local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage")
local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage")
local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi")
local XianShiDuiHuan=require("Modules/Expert/ExChange")
--初始化组件(用于子类重写)
function DynamicActivityPanel:InitComponent()
@ -47,12 +72,13 @@ function DynamicActivityPanel:InitComponent()
this.content = Util.GetGameObject(self.gameObject, "bg/pageContent")
this.PageList = {
[1] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
[1] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
[2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
[3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
[4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
[5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
[6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
[7] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")),
}
-- 上部货币显示
@ -65,7 +91,6 @@ function DynamicActivityPanel:BindEvent()
this.PageTabCtrl:SetTabAdapter(this.PageTabAdapter)
this.PageTabCtrl:SetTabIsLockCheck(this.PageTabIsLockCheck)
this.PageTabCtrl:SetChangeTabCallBack(this.OnPageTabChange)
-- 关闭界面打开主城
Util.AddClick(this.btnBack, function()
this:ClosePanel()
@ -76,26 +101,25 @@ end
--添加事件监听(用于子类重写)
function DynamicActivityPanel:AddListener()
for i = 1, #this.PageList do
if this.PageList[i] and this.PageList[i].AddListener then
if this.PageList[i] then
this.PageList[i]:AddListener()
end
end
end
--移除事件监听(用于子类重写)
function DynamicActivityPanel:RemoveListener()
for i = 1, #this.PageList do
if this.PageList[i] and this.PageList[i].RemoveListener then
if this.PageList[i] then
this.PageList[i]:RemoveListener()
end
end
end
--界面打开时调用(用于子类重写)
function DynamicActivityPanel:OnOpen(chooseIndex)
-- 初始化tab数据
this.PageTabCtrl:Init(this.tabbox, _PageInfo)
this.PageTabCtrl:Init(this.tabbox, tabs)
this._CurPageIndex = chooseIndex or 1
end
@ -114,7 +138,7 @@ function this.PageTabAdapter(tab, index, status)
local lock = Util.GetGameObject(tab, "lock")
local redpot = Util.GetGameObject(tab, "redpot")
img.sprite = Util.LoadSprite(_PageInfo[index][status])
img.sprite = Util.LoadSprite(tabs[index][status])
img:SetNativeSize()
local islock = status == "lock"
Util.SetGray(img.gameObject, islock)
@ -126,6 +150,21 @@ function this.PageTabAdapter(tab, index, status)
this.ClearPageRedpot(index)
this.BindPageRedpot(index, redpot)
end
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActType)
if id and id > 0 then
if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then
tab:SetActive(GlobalActConfig[id].ShowArt == index)
else
tab.gameObject:SetActive(true)
end
--限时兑换特殊处理
if GlobalActConfig[id].Type == ActivityTypeDef.LimitExchange then
tab.gameObject:SetActive(GlobalActConfig[id].ShowArt ~= 1)
end
else
tab.gameObject:SetActive(false)
end
end
-- tab可用性检测
@ -142,18 +181,17 @@ function this.OnPageTabChange(index)
this.PageList[i]:OnHide()
this.PageList[i].gameObject:SetActive(false)
end
end
this.PageList[index]:OnShow(this.sortingOrder,this)
this.PageList[index].gameObject:SetActive(true)
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = _PageInfo[index].panelType })
this.PageList[_PageInfo[index]]:OnShow(this.sortingOrder,this)
this.PageList[_PageInfo[index]].gameObject:SetActive(true)
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = tabs[index].panelType })
end
-- 绑定数据
local _PageBindData = {}
local _TabBindData = {}
function this.BindPageRedpot(page, redpot)
local rpType = _PageInfo[page].rpType
local rpType = tabs[page].rpType
if not rpType then return end
BindRedPointObject(rpType, redpot)
_PageBindData[rpType] = redpot
@ -161,7 +199,7 @@ end
function this.ClearPageRedpot(page)
-- 清除红点绑定
if page then -- 清除某个
local rpType = _PageInfo[page].rpType
local rpType = tabs[page].rpType
if not rpType then return end
ClearRedPointObject(rpType, _PageBindData[rpType])
_PageBindData[rpType] = nil
@ -176,8 +214,8 @@ end
--界面关闭时调用(用于子类重写)
function DynamicActivityPanel:OnClose()
if this._CurPageIndex then
this.PageList[this._CurPageIndex]:OnHide()
this.PageList[this._CurPageIndex].gameObject:SetActive(false)
this.PageList[_PageInfo[this._CurPageIndex]]:OnHide()
this.PageList[_PageInfo[this._CurPageIndex]].gameObject:SetActive(false)
end
end
--界面销毁时调用(用于子类重写)

View File

@ -0,0 +1,276 @@
local DynamicTaskPage = quick_class("DynamicTaskPage")
local allData={}
local itemsGrid = {}--item重复利用
local singleTaskPre = {}
local this=DynamicTaskPage
local parent
local endtime = 0
local bannerType = {
[1] = "bg1",
[2] = "bg2",
[3] = "bg3",
}
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
function DynamicTaskPage:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
self.gameObject = gameObject
self:InitComponent(gameObject)
self:BindEvent()
end
function DynamicTaskPage:InitComponent(gameObject)
itemsGrid = {}--item重复利用
singleTaskPre = {}
this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text")
this.itemPre = Util.GetGameObject(gameObject, "itempre")
this.scrollItem = Util.GetGameObject(gameObject, "grid")
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, 30))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 2
this.gameObject = gameObject
end
--绑定事件(用于子类重写)
function DynamicTaskPage:BindEvent()
end
function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.Refresh)
end
function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.Refresh)
end
local sortingOrder = 0
--界面打开时调用(用于子类重写)
function DynamicTaskPage:OnOpen()
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function DynamicTaskPage:OnShow(_sortingOrder,_parent)
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
local curindex = GlobalActConfig[id].ShowArt
for k,v in pairs(bannerType) do
Util.GetGameObject(this.gameObject, v):SetActive(false)
end
Util.GetGameObject(this.gameObject, bannerType[curindex]):SetActive(true)
sortingOrder = _sortingOrder
parent = _parent
this.Refresh()
end
function this.Refresh()
allData = OperatingManager:InitDynamicActData()
this:OnShowData()
this:SetTime()
end
function DynamicTaskPage:SetTime()
if self.timer then
self.timer:Stop()
self.timer = nil
end
local five_timeDown
local week_timeDown
five_timeDown = CalculateSecondsNowTo_N_OClock(5)
week_timeDown = endtime - GetTimeStamp()
for k,v in pairs(singleTaskPre) do
-- v.com.gameObject:SetActive(true)
if v and v.data.type == 1 then
if five_timeDown > 3600 then
v.com:GetComponent("Text").text = Language[10561]..TimeToH(five_timeDown)
else
v.com:GetComponent("Text").text = Language[10561]..TimeToMS(five_timeDown)
end
else
if week_timeDown > 3600 then
v.com:GetComponent("Text").text = Language[10561]..TimeToDH(week_timeDown)
else
v.com:GetComponent("Text").text = Language[10561]..TimeToMS(week_timeDown)
end
end
end
this.time.text = Language[12321]..TimeToDHMS(week_timeDown)
self.timer = Timer.New(function()
five_timeDown = five_timeDown - 1
week_timeDown = week_timeDown - 1
if five_timeDown <= 0 then
this.Refresh()
return
end
if week_timeDown <= 0 then
parent:ClosePanel()
return
end
for k,v in pairs(singleTaskPre) do
-- v.com.gameObject:SetActive(true)
if v and v.data.type == 1 then
if five_timeDown >= 3600 then
v.com:GetComponent("Text").text = Language[10561]..TimeToH(five_timeDown)
else
v.com:GetComponent("Text").text = Language[10561]..TimeToMS(five_timeDown)
end
else
if week_timeDown >= 3600 then
v.com:GetComponent("Text").text = Language[10561]..TimeToDH(week_timeDown)
else
v.com:GetComponent("Text").text = Language[10561]..TimeToMS(week_timeDown)
end
end
end
this.time.text = Language[12321]..TimeToDHMS(week_timeDown)
end, 1, -1, true)
self.timer:Start()
end
function DynamicTaskPage:OnShowData()
if allData then
endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct)
this.SortData(allData)
this.ScrollView:SetData(allData, function (index, go)
this.SingleDataShow(go, allData[index])
if not singleTaskPre[go] then
singleTaskPre[go] = {}
end
singleTaskPre[go].com = Util.GetGameObject(go,"btn/Text")
singleTaskPre[go].data = allData[index]
end)
else
parent.OnPageTabChange(1)
PopupTipPanel.ShowTip(Language[12320])
return
end
end
local typeIndex = {
[0] = 1,
[1] = 0,
[2] = 2,
}
function DynamicTaskPage:SortData()
if allData==nil then
return
end
table.sort(allData, function(a,b)
if typeIndex[a.state] == typeIndex[b.state] then
if a.type == b.type then
return a.id < b.id
else
return a.type < b.type
end
else
return typeIndex[a.state] < typeIndex[b.state]
end
end)
end
local type={
[0]={sprite = "s_slbz_1anniuhuangse",text = Language[10023]},
[1]={sprite = "s_slbz_1anniuongse",text = Language[10022]},
[2]={sprite = "s_slbz_1anniuhuise",text = Language[10350]},
}
--刷新每一条的显示数据
function this.SingleDataShow(pre,value)
if pre==nil or value==nil then
return
end
--绑定组件
local activityRewardGo = pre
activityRewardGo:SetActive(true)
local sConFigData = value
local titleText = Util.GetGameObject(activityRewardGo, "title"):GetComponent("Text")
titleText.text = sConFigData.title .."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")"
local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text")
missionText.text = sConFigData.content
local timeText = Util.GetGameObject(activityRewardGo, "btn/Text")
local reward = Util.GetGameObject(activityRewardGo.gameObject, "reward")
if (not itemsGrid) then
itemsGrid = {}
end
if not itemsGrid[pre] then
itemsGrid[pre] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform)
end
itemsGrid[pre]:OnOpen(false, sConFigData.reward, 0.9, false)
local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btn")
--0-未完成1-完成未领取 2-已领取
local state = sConFigData.state
timeText:SetActive(state == 0)
local red = Util.GetGameObject(lingquButton.gameObject, "redPoint")
red:SetActive(state == 1)
Util.GetGameObject(lingquButton.gameObject, "Button/Text"):GetComponent("Text").text = type[state].text
Util.GetGameObject(lingquButton.gameObject, "Button"):GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite)
Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 2)
Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 2)
Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function()
if state == 1 then
NetManager.TakeMissionRewardRequest(TaskTypeDef.DynamicActTask,sConFigData.id, function(respond)
UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function ()
this.Refresh()
CheckRedPointStatus(RedPointType.DynamicActTask)
end)
end)
elseif state == 0 then
if sConFigData.jump then
JumpManager.GoJump(sConFigData.jump)
end
end
end)
end
--界面打开时调用(用于子类重写)
function DynamicTaskPage:OnOpen()
end
function this.RechargeSuccessFunc(id)
FirstRechargeManager.RefreshAccumRechargeValue(id)
--OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id)
this.Refresh()
end
function DynamicTaskPage:OnClose()
end
--界面销毁时调用(用于子类重写)
function DynamicTaskPage:OnDestroy()
if self.timer then
self.timer:Stop()
self.timer = nil
end
sortingOrder = 0
singleTaskPre = {}
itemsGrid = {}
end
function DynamicTaskPage:OnHide()
if self.timer then
self.timer:Stop()
self.timer = nil
end
end
--- 将一段时间转换为天时分秒
function DynamicTaskPage:TimeToDHMS(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
local sec = second % 60
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
if day <= 0 and hour <= 0 then
return string.format(Language[12231],minute, sec)
else
return string.format(Language[12232],day, hour)
end
end
return DynamicTaskPage

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f9ec68d01af2c6449a01c538256f1671
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -16,9 +16,10 @@ function LeiJiChongZhiPage:InitComponent(gameObject)
this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text")
this.itemPre = Util.GetGameObject(gameObject, "ItemPre")
this.scrollItem = Util.GetGameObject(gameObject, "grid")
local rootHight = this.scrollItem:GetComponent("RectTransform").sizeDelta
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(rootHight.x, rootHight.y), 1, 1, Vector2.New(0, 30))
this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 30))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 2
end
@ -76,7 +77,7 @@ end
function LeiJiChongZhiPage:OnShowData()
allData =OperatingManager.InitLeiJiChongZhiData()
if allData then
endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_recharge)
endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct_recharge)
this.SortData(allData)
this.ScrollView:SetData(allData, function (index, go)
this.SingleDataShow(go, allData[index])
@ -156,7 +157,7 @@ function this.SingleDataShow(pre,value)
Util.AddOnceClick(lingquButton, function()
if state == 2 then
local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_recharge)
local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.DynamicAct_recharge)
NetManager.GetActivityRewardRequest(sConFigData.id, curActivityId,function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
this.Refresh()

View File

@ -1,7 +1,7 @@
local QianKunBox = quick_class("QianKunBox")
local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情
local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",4401)
local parent
local iconsData = nil
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
@ -10,12 +10,16 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local lotterySpecialConfig = ConfigManager.GetConfig(ConfigName.LotterySpecialConfig)
local orginLayer = 0
local activityId = 0
local singleRecruit = nil
local tenRecruit = nil
local bType={
Btn1=1,
Btn10=2
}
--type与lotterySetting表中的id对应
local btns={ [bType.Btn1]={name="bottom/btnOne",isInfo=Language[10644],type=RecruitType.QianKunBoxSingle}, [bType.Btn10]={name="bottom/btnTen",isInfo=Language[12182],type=RecruitType.QianKunBoxTen}}
local btns={ [bType.Btn1]={name="bottom/btnOne",isInfo=Language[10644]}, [bType.Btn10]={name="bottom/btnTen",isInfo=Language[12182]}}
function QianKunBox:ctor(mainPanel, gameObject)
@ -73,9 +77,7 @@ function QianKunBox:BindEvent()
self.effect:SetActive(false)
ActivityDetail.new(self.detail,2,self.effect)
end)
Util.AddClick(self.btnStore,function()
self:storeShow()--商店
Util.AddClick(self.btnStore,function()
self.effect:SetActive(false)
self.shop:SetActive(true)
self.btnBack:SetActive(false)
@ -83,6 +85,7 @@ function QianKunBox:BindEvent()
self.bottomBar:SetActive(false)
self.livename = "live2d_ui_h_52_xx_pf1"
self.liveNode = poolManager:LoadLive(self.livename, self.live.transform, Vector3.New(0.25,0.25,0.25), Vector3.New(123,214,0))
self:storeShow()--商店
end)
Util.AddClick(self.shopBack,function()
self.effect:SetActive(true)
@ -95,11 +98,15 @@ function QianKunBox:BindEvent()
end)
end
function QianKunBox:OnShow(sortingOrder)
function QianKunBox:OnShow(sortingOrder,_parent)
parent = _parent
Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer)
orginLayer = sortingOrder
activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
singleRecruit = array[1]
tenRecruit = array[2]
iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",singleRecruit.DiamondBoxContain[1][1])
self.gameObject:SetActive(true)
self:refreshMagicNum()
self:refreshBtnShow()--刷新按钮显示
@ -113,8 +120,8 @@ function QianKunBox:refreshBtnShow()
-- self.btnTen2:SetActive(BagManager.GetItemCountById(16)>=2000)
-- self.btnTen1:SetActive(BagManager.GetItemCountById(16)<2000)
local freeTimesId=lotterySetting[RecruitType.QianKunBoxSingle].FreeTimes
local maxtimesId=lotterySetting[RecruitType.QianKunBoxSingle].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id
local freeTimesId=lotterySetting[singleRecruit.Id].FreeTimes
local maxtimesId=lotterySetting[singleRecruit.Id].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id
local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
local freeTime= 0
self.limit.text = Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]
@ -144,7 +151,13 @@ function QianKunBox:refreshBtnShow()
local itemId=0
local itemNum=0
local d=RecruitManager.GetExpendData(m.type)
local type = 0
if n==bType.Btn1 then
type = singleRecruit.Id
else
type = tenRecruit.Id
end
local d=RecruitManager.GetExpendData(type)
if(isFree) then
info.text=Language[11759]
else
@ -170,14 +183,14 @@ function QianKunBox:refreshBtnShow()
return
end
local recruitOne = function()
RecruitManager.RecruitRequest(m.type, function(msg)
RecruitManager.RecruitRequest(singleRecruit.Id, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数
UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop)
UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,singleRecruit.Id)
CheckRedPointStatus(RedPointType.QianKunBox)
end,freeTimesId)
end
if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxSingle,recruitOne)
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,singleRecruit.Id,recruitOne)
else
recruitOne()
end
@ -187,14 +200,14 @@ function QianKunBox:refreshBtnShow()
return
end
local recruitTen = function()
RecruitManager.RecruitRequest(m.type, function(msg)
RecruitManager.RecruitRequest(tenRecruit.Id, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数
UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop)
UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,tenRecruit.Id)
CheckRedPointStatus(RedPointType.QianKunBox)
end,freeTimesId)
end
if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxTen,recruitTen)
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,tenRecruit.Id,recruitTen)
else
recruitTen()
end
@ -226,7 +239,6 @@ function QianKunBox:storeShow()
self.shopView = SubUIManager.Open(SubUIConfig.ShopView, self.content.transform)
end
self.shopView:ShowShop(SHOP_TYPE.QIANKUNBOX_SHOP,orginLayer)
end
--时间
@ -239,6 +251,12 @@ function QianKunBox:timeCountDown()
self.timer = Timer.New(function()
self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime)
self.btnTime.text = TimeToHMS(timeDown)
if timeDown < 1 then
self.timer:Stop()
self.timer = nil
parent:ClosePanel()
return
end
timeDown = timeDown -1
end, 1, -1, true)
self.timer:Start()
@ -258,9 +276,10 @@ function QianKunBox:TimeToDHMS(second)
end
function QianKunBox:refreshMagicNum()
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox)
self.leftUptips1.text = lotterySpecialConfig[20].Count-math.floor(actData.value/1000)
self.btnTimes.text = tostring(lotterySpecialConfig[21].Count-actData.value%1000)..Language[12264]
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox)
local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool)
self.leftUptips1.text = d[1].Count-math.floor(actData.value/1000)
self.btnTimes.text = tostring(d[2].Count-actData.value%1000)..Language[12264]
self.midDowntips1.text = Language[12239]
end
@ -281,4 +300,14 @@ function QianKunBox:OnHide()
end
end
--添加事件监听(用于子类重写)
function QianKunBox:AddListener()
end
--移除事件监听(用于子类重写)
function QianKunBox:RemoveListener()
end
return QianKunBox

View File

@ -8,8 +8,6 @@ local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardC
local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local maxtimesId=lotterySetting[RecruitType.QianKunBoxSingle].MaxTimes
local freeTimesId=lotterySetting[RecruitType.QianKunBoxSingle].FreeTimes
--活动抽卡类型(动态的数据)
local drawtType={
@ -56,11 +54,13 @@ function QianKunBoxBuyOnePanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(this.openOneAgainButton, function ()
local maxtimesId=lotterySetting[this.recruitType].MaxTimes
local freeTimesId=lotterySetting[this.recruitType].FreeTimes
if(BagManager.GetItemCountById(1002)>=1 or BagManager.GetItemCountById(16)>=200) then
self:ClosePanel()
RecruitManager.RecruitRequest(RecruitType.QianKunBoxSingle, function(msg)
RecruitManager.RecruitRequest(this.recruitType, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数
UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel,msg.drop)
UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel,msg.drop,this.recruitType)
CheckRedPointStatus(RedPointType.QianKunBox)
end,freeTimesId)
else
@ -94,8 +94,8 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })
local args = { ... }
this.drop=args[1]
this.detailImage:SetActive(not this.recruitType)
this.recruitType = args[2]
this.detailImage:SetActive(true)
this.content1:SetActive(false)
this.content2:SetActive(false)
this.content3:SetActive(true)
@ -103,7 +103,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
local itemId=0
local itemNum=0
local d
d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle)
d = RecruitManager.GetExpendData(this.recruitType)
itemId=d[1]
itemNum=d[2]
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)

View File

@ -6,8 +6,7 @@ local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local gameSetting=ConfigManager.GetConfig(ConfigName.GameSetting)
local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting)
local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local maxtimesId=lotterySetting[RecruitType.QianKunBoxTen].MaxTimes
local freeTimesId=lotterySetting[RecruitType.QianKunBoxTen].FreeTimes
--活动抽卡类型(动态的数据)
local drawtType={
FindFairySingle=0,
@ -59,17 +58,19 @@ end
--绑定事件(用于子类重写)
function QianKunBoxBuyTenPanel:BindEvent()
Util.AddClick(this.btnBack, function ()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
Util.AddClick(this.openTenAgainButton, function ()
local maxtimesId=lotterySetting[this.recruitType].MaxTimes
local freeTimesId=lotterySetting[this.recruitType].FreeTimes
if(BagManager.GetItemCountById(1003)>=10 or BagManager.GetItemCountById(16>=2000)) then
self:ClosePanel()
RecruitManager.RecruitRequest(RecruitType.QianKunBoxTen, function(msg)
RecruitManager.RecruitRequest(this.recruitType, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数
UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel,msg.drop)
UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel,msg.drop,this.recruitType)
CheckRedPointStatus(RedPointType.QianKunBox)
end,freeTimesId)
else
@ -109,9 +110,9 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
-- this.itemIcon1.sprite=Util.LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID))
local args = { ... }
this.drop=args[1]
this.recruitType = args[2]
this.detailImage:SetActive(not this.recruitType)
this.detailImage:SetActive(true)
this.content1:SetActive(false)
this.content2:SetActive(false)
this.content3:SetActive(true)
@ -120,7 +121,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
local itemId=0
local itemNum=0
local d
d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen)
d=RecruitManager.GetExpendData(this.recruitType)
itemId=d[1]
itemNum=d[2]
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)

View File

@ -4,25 +4,28 @@ local data = {}
local listPre = {}
local curtimes = 0
local intervalDatas={}
local curActivityId = 0
local singleRecruit = nil
local tenRecruit = nil
function RewardPreview:ctor(gameObject)
self.gameObject = gameObject
self:InitComponent(gameObject)
self:InitComponent()
self:BindEvent()
self:OnShow()
end
function RewardPreview:InitComponent(gameObject)
function RewardPreview:InitComponent()
self.closeBtn = Util.GetGameObject(self.gameObject, "close")
self.itemGrid = Util.GetGameObject(self.gameObject, "itemGrid")
self.itemPre = Util.GetGameObject(self.gameObject, "itemprefab")
self.curtimes = Util.GetGameObject(self.gameObject, "tip1"):GetComponent("Text")
self.sliderWidth = Util.GetGameObject(self.gameObject, "Background"):GetComponent("RectTransform").sizeDelta.x
self.slider = Util.GetGameObject(self.gameObject, "Background/Fill"):GetComponent("Image")
self.sliderWidth = Util.GetGameObject(self.gameObject, "Background"):GetComponent("RectTransform").sizeDelta.x
self.curtimes = Util.GetGameObject(self.gameObject, "tip1"):GetComponent("Text")
end
function RewardPreview:BindEvent()
Util.AddClick(
self.closeBtn.gameObject,
self.closeBtn,
function()
self:OnHide()
end
@ -31,7 +34,12 @@ end
function RewardPreview:OnShow()
self.gameObject:SetActive(true)
local maxtimesId = lotterySetting[RecruitType.TimeLimitSingle].MaxTimes
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",curActivityId)
singleRecruit = array[1]
tenRecruit = array[2]
local maxtimesId = lotterySetting[singleRecruit.Id].MaxTimes
curtimes = OperatingManager.TimeLimitedTimes
self:RefreshRewarid()
self.curtimes.text = Language[12181] .. curtimes
@ -39,7 +47,6 @@ function RewardPreview:OnShow()
end
function RewardPreview:RefreshRewarid()
local curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
data = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", curActivityId)
local tmp = 0
--间隔的总次数 比如30 60 120 210 300 count=60-30+ 120 - 60+ 210 - 120+ 300 - 210= 300 - 30 =270
@ -54,8 +61,8 @@ function RewardPreview:RefreshRewarid()
count = data[#data].Values[1][1]
tmp = 0
local position = 0
local width = self.itemPre.transform:GetComponent("RectTransform").sizeDelta.x
local interval = self.itemGrid.transform:GetComponent("RectTransform").sizeDelta.x - (width * #data)
local width = self.itemPre:GetComponent("RectTransform").sizeDelta.x
local interval = self.itemGrid:GetComponent("RectTransform").sizeDelta.x - (width * #data)
if (not listPre) then
listPre = {}
end
@ -89,13 +96,8 @@ end
function RewardPreview:CalculateInterval(count)
local width = self.itemPre.transform:GetComponent("RectTransform").sizeDelta.x
if not data or #data < 1 then
local curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
data = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", curActivityId)
end
-- LogBlue(#intervalDatas)
-- for n,m in ipairs(intervalDatas) do
-- LogBlue(m)
-- end
local interval = 0
if count >= data[5].Values[1][1] then
interval = intervalDatas[5] + (curtimes - data[5].Values[1][1]) * (1-intervalDatas[5])/(500-data[5].Values[1][1])

View File

@ -8,20 +8,54 @@ local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local parent
local activityId = 0
local singleRecruit = nil
local tenRecruit = nil
--按钮类型
local bType={
Btn1=1,
Btn10=2
}
local activityType = {
--破阵诛仙 限时召唤
[4301] = {
bg = "Bg1",
hero = {
[1]={name="Bg1/hero1",id=10001,hero="x_xianshizaohuan_fx"},
[2]={name="Bg1/hero3",id=10041,hero="x_xianshizaohuan_ttjz"},
[3]={name="Bg1/hero2",id=10089,hero="x_xianshizaohuan_rd"},
},
title = "x_xianshizaohuan_solgan",
helptype = HELP_TYPE.TimeLimitedCall
},
--勇冠三军 限时召唤
[4302] = {
bg = "Bg2",
hero = {
[1]={name="Bg2/hero1",id=10009,hero="c_ygsj_kuang02"},
[2]={name="Bg2/hero3",id=10026,hero="c_ygsj_kuang03"},
[3]={name="Bg2/hero2",id=10040,hero="c_ygsj_kuang01"},
},
title = "c_ydsj_slogan",
helptype = HELP_TYPE.TimeLimitedCall
},
--叱咤风云 限时召唤
[4303] = {
bg = "Bg2",
hero = {
[1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"},
[2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"},
[3]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"},
},
title = "c_ccfy_slogan",
helptype = HELP_TYPE.TimeLimitedCall
},
}
--type与lotterySetting表中的id对应
local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644],type=RecruitType.TimeLimitSingle}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182],type=RecruitType.TimeLimitTen}}
local tabs={"activity","reward"}
local secectTab=-1
local hero={[1]={name="Bg/hero1",id=10001,hero="x_xianshizaohuan_fx"},[2]={name="Bg/hero3",id=10041,hero="x_xianshizaohuan_ttjz"},[3]={name="Bg/hero2",id=10089,hero="x_xianshizaohuan_rd"}}
local curLv=0 --当前阶段id
local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644]}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182]}}
local curLv = 0 --当前阶段id
local itemView
function TimeLimitedCall:ctor(mainPanel, gameObject)
@ -34,48 +68,40 @@ end
function TimeLimitedCall:InitComponent(gameObject)
self.helpBtn = Util.GetGameObject(self.gameObject,"help")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.activityBtn = Util.GetGameObject(self.gameObject,"activity")
self.rewardBtn = Util.GetGameObject(self.gameObject,"reward")
self.rewardBtn = Util.GetGameObject(self.gameObject,"rewardBtn")
self.rewardBtn:SetActive(false)--(暂时关闭)
self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --剩余时间
self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --免费次数剩余刷新时间
self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限
self.slider = Util.GetGameObject(self.gameObject, "nextlevel/Slider"):GetComponent("Slider")
self.sliderText=Util.GetGameObject(self.gameObject,"nextlevel/Text"):GetComponent("Text")
self.curtext = Util.GetGameObject(self.gameObject, "curvalue/Text"):GetComponent("Text")
self.frame = Util.GetGameObject(self.gameObject, "curvalue/frame"):GetComponent("Image")
self.nextReward = Util.GetGameObject(self.gameObject, "nextlevel/reward")
self.icon = Util.GetGameObject(self.frame.gameObject, "icon"):GetComponent("Image")
self.getBtn=Util.GetGameObject(self.gameObject,"nextlevel")
self.slider = Util.GetGameObject(self.getBtn, "Slider"):GetComponent("Slider")
self.sliderText=Util.GetGameObject(self.getBtn,"Text"):GetComponent("Text")
self.nextReward = Util.GetGameObject(self.getBtn, "reward")
self.detail= Util.GetGameObject(self.gameObject, "detail")
self.detail.gameObject:SetActive(false)
self.reward= Util.GetGameObject(self.gameObject, "reward")
self.reward.gameObject:SetActive(false)
self.getBtn=Util.GetGameObject(self.gameObject,"nextlevel")
self.effect=Util.GetGameObject(self.gameObject,"juneng_chenggong")
self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong")
self.hero1 = Util.GetGameObject(self.gameObject,"Bg/hero1")
self.hero2 = Util.GetGameObject(self.gameObject,"Bg/hero2")
self.hero3 = Util.GetGameObject(self.gameObject,"Bg/hero3")
self.recruitTimeUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text1") :GetComponent("Text") --时间
self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text") :GetComponent("Text") --剩余次数
self.recruitTimeUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text1") :GetComponent("Text") --活动剩余时间
self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text") :GetComponent("Text") --保底剩余次数
end
function TimeLimitedCall:BindEvent()
Util.AddClick(self.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TimeLimitedCall,self.helpPosition.x,self.helpPosition.y)
--UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TimeLimitedCall,self.helpPosition.x,self.helpPosition.y)
UIManager.OpenPanel(UIName.HelpPopup,activityType[activityId].helptype,self.helpPosition.x,self.helpPosition.y)
end)
Util.AddClick(self.activityBtn, function()
secectTab=1
self:RefreshTabBtn()
ActivityDetail.new(self.detail,1)
end)
Util.AddClick(self.rewardBtn, function()
secectTab=2
self:RefreshTabBtn()
Util.AddClick(self.rewardBtn, function()
local fb = ConfigManager.GetConfigData(ConfigName.FakeBattle, 1001)
local testFightData = {
fightData = loadstring("return "..fb.FightData)(),
@ -85,58 +111,50 @@ function TimeLimitedCall:BindEvent()
}
UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test)
end)
Util.AddClick(self.hero1, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, 10001, 5)
end)
Util.AddClick(self.hero2, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, 10089, 5)
end)
Util.AddClick(self.hero3, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, 10041, 5)
end)
end
function TimeLimitedCall:OnShow(_sortingOrder)
function TimeLimitedCall:OnShow(_sortingOrder,_parent)
parent = _parent
sortingOrder = _sortingOrder
self.gameObject:SetActive(true)
local UpHero=RecruitManager.GetRewardPreviewData(PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP)
table.sort(UpHero,function(a,b) return a.Reward[1]<b.Reward[1] end)
for n,m in ipairs(hero) do
Util.GetGameObject(self.gameObject,m.name.."/hero"):GetComponent("Image").sprite=Util.LoadSprite(m.hero)
local configinfo= ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig, "Id", UpHero[n].Reward[1])
Util.GetGameObject(self.gameObject,m.name.."/icon"):GetComponent("Image").sprite=Util.LoadSprite(GetJobSpriteStrByJobNum(configinfo.PropertyName))
Util.GetGameObject(self.gameObject,m.name.."/name"):GetComponent("Text").text=configinfo.ReadingName
--SetHeroStars(Util.GetGameObject(self.gameObject,m.name.."/starlayout"),5)
for n,m in pairs(activityType) do
Util.GetGameObject(self.gameObject,m.bg):SetActive(false)
end
activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
Util.GetGameObject(self.gameObject,activityType[activityId].bg):SetActive(true)
Util.GetGameObject(self.gameObject,activityType[activityId].bg.."/Image (3)"):GetComponent("Image").sprite = Util.LoadSprite(activityType[activityId].title)
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
singleRecruit = array[1]
tenRecruit = array[2]
local UpHero = RecruitManager.GetRewardPreviewData(PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP)
table.sort(UpHero,function(a,b) return a.Reward[1] < b.Reward[1] end)
for n,m in ipairs(activityType[activityId].hero) do
Util.GetGameObject(self.gameObject,m.name.."/hero"):GetComponent("Image").sprite=Util.LoadSprite(m.hero)
local configinfo= ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig, "Id", m.id)
--LogGreen("configinfo.PropertyName:"..configinfo.PropertyName)
Util.GetGameObject(self.gameObject,m.name.."/icon"):GetComponent("Image").sprite=Util.LoadSprite(GetJobSpriteStrByJobNum(configinfo.PropertyName))
Util.GetGameObject(self.gameObject,m.name.."/name"):GetComponent("Text").text=configinfo.ReadingName
Util.AddOnceClick(Util.GetGameObject(self.gameObject,m.name), function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, m.id, 5)
end)
end
secectTab=-1
self:RefreshTabBtn()
self:RefreshGetHeroTimes()
self:TimeCountDown()
self:RefreshNextLevelReward()
end
function TimeLimitedCall:RefreshTabBtn()
for n, m in pairs(tabs) do
if n~=secectTab then
Util.GetGameObject(self.gameObject,tabs[n].."/select").gameObject:SetActive(false)
else
Util.GetGameObject(self.gameObject,tabs[n].."/select").gameObject:SetActive(true)
end
end
end
function TimeLimitedCall:RefreshNextLevelReward()
local curActivityId=0
local curLvstate = 0
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
local curTimes = 0
curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
local data1= ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curActivityId) --通过活动id获取阶段任务
local data1 = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId) --通过活动id获取阶段任务
local rewarditem
for n,m in ipairs(data1) do
curTimes,curLvstate = self:GetMissionStateById(m.Id,curActivityId)
curTimes,curLvstate = self:GetMissionStateById(m.Id,activityId)
if(curTimes>=m.Values[1][1]) then
if curLvstate==0 then
curLvstate=0
@ -175,7 +193,7 @@ function TimeLimitedCall:RefreshNextLevelReward()
self.sliderText.text=Language[12183]
self.sliderText.fontSize=26
Util.AddOnceClick(self.getBtn,function()
NetManager.GetActivityRewardRequest(curLv, curActivityId,
NetManager.GetActivityRewardRequest(curLv, activityId,
function(respond)
UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1)
self:RefreshNextLevelReward()
@ -184,8 +202,6 @@ function TimeLimitedCall:RefreshNextLevelReward()
end)
self.effect.gameObject:SetActive(true)
elseif (curLvstate==-1) then
-- self.slider.gameObject:SetActive(false)
-- self.sliderText.gameObject:SetActive(false)
self.slider.value=1
Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text="300/300"
self.sliderText.text=Language[12322]
@ -197,7 +213,7 @@ function TimeLimitedCall:RefreshNextLevelReward()
Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text=curTimes.."/"..rewarditem.Values[1][1]
local vec=self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D
vec.y=22.4
self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D=vec
self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D = vec
self.sliderText.text=Language[12184]..curTimes.."/"..rewarditem.Values[1][1]
self.sliderText.fontSize=26
self.slider.value=curTimes/rewarditem.Values[1][1]
@ -207,14 +223,19 @@ function TimeLimitedCall:RefreshNextLevelReward()
end)
end
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(curActivityId)
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count - reMaintimes
local reMaintimes = info.value
--LogBlue("reMaintimes:"..reMaintimes)
--LogGreen("singleRecruit.MergePool:"..singleRecruit.MergePool)
local totalTimes = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool).Count
reMaintimes = totalTimes - reMaintimes
if reMaintimes == 0 then
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count
reMaintimes = totalTimes
end
self.recruitTimesUpdate.text = string.format(Language[12229],reMaintimes)
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
info = info.endTime - PlayerManager.serverTime
info = self:TimeToDHMS(info)
self.recruitTimeUpdate.text = string.format(Language[12230]..info)
@ -239,10 +260,9 @@ end
--刷新剩余次数
function TimeLimitedCall:RefreshGetHeroTimes()
local freeTimesId=lotterySetting[RecruitType.TimeLimitSingle].FreeTimes
local maxtimesId=lotterySetting[RecruitType.TimeLimitSingle].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id
local freeTimesId=lotterySetting[singleRecruit.Id].FreeTimes
local maxtimesId=lotterySetting[singleRecruit.Id].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id
local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
self.curtext.text=curTimes
self.upper.text= Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限
self.timeupdate.gameObject:SetActive(true)
local freeTime= 0
@ -269,7 +289,13 @@ function TimeLimitedCall:RefreshGetHeroTimes()
local itemId=0
local itemNum=0
local d=RecruitManager.GetExpendData(m.type)
local type = 0
if n==bType.Btn1 then
type = singleRecruit.Id
else
type = tenRecruit.Id
end
local d=RecruitManager.GetExpendData(type)
if(isFree) then
info.text=Language[11759]
else
@ -294,14 +320,14 @@ function TimeLimitedCall:RefreshGetHeroTimes()
return
end
local recruitOne = function()
RecruitManager.RecruitRequest(m.type, function(msg)
RecruitManager.RecruitRequest(singleRecruit.Id, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1)
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],singleRecruit.Id,bType.Btn1)
CheckRedPointStatus(RedPointType.TimeLimited)
end,freeTimesId)
end
if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitSingle,recruitOne)
if state==0 and d[1] == 16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,singleRecruit.Id,recruitOne)
else
recruitOne()
end
@ -312,14 +338,14 @@ function TimeLimitedCall:RefreshGetHeroTimes()
return
end
local recruitTen = function()
RecruitManager.RecruitRequest(m.type, function(msg)
RecruitManager.RecruitRequest(tenRecruit.Id, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10)
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, tenRecruit.Id,bType.Btn10)
CheckRedPointStatus(RedPointType.TimeLimited)
end,freeTimesId)
end
if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitTen,recruitTen)
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,tenRecruit.Id,recruitTen)
else
recruitTen()
end
@ -340,6 +366,7 @@ function TimeLimitedCall:TimeCountDown()
if timeDown < 1 then
self.timer:Stop()
self.timer = nil
parent:ClosePanel()
return
end
timeDown = timeDown - 1
@ -367,4 +394,14 @@ function TimeLimitedCall:OnDestroy()
end
end
--添加事件监听(用于子类重写)
function TimeLimitedCall:AddListener()
end
--移除事件监听(用于子类重写)
function TimeLimitedCall:RemoveListener()
end
return TimeLimitedCall

View File

@ -3,6 +3,7 @@ local allData={}
local itemsGrid = {}--item重复利用
local this=XianShiShangShi
local parent
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)
function XianShiShangShi:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
self.gameObject = gameObject
@ -47,7 +48,13 @@ function XianShiShangShi:OnShow(_sortingOrder,_parent)
XianShiShangShi:SetTime()
end
function XianShiShangShi:OnShowData()
allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 22, "Type", GoodsTypeDef.DirectPurchaseGift)
allData={}
-- allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 22, "Type", GoodsTypeDef.DirectPurchaseGift)
local curActId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_TimeLimitShop)
for i = 1, #GlobalActivity[curActId].CanBuyRechargeId do
local data = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "Id", GlobalActivity[curActId].CanBuyRechargeId[i])
table.insert(allData,data)
end
if allData then
this.SortData(allData)
this.ScrollView:SetData(allData, function (index, go)
@ -63,7 +70,7 @@ function XianShiShangShi:SetTime()
self.timer:Stop()
self.timer = nil
end
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_TimeLimitShop)
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct_TimeLimitShop)
local timeDown = endTime - GetTimeStamp()
this.time.text = Language[12321]..TimeToDHMS(timeDown)
self.timer = Timer.New(function()

View File

@ -3,6 +3,7 @@ local allData={}
local itemsGrid = {}--item重复利用
local this=ZhenQiYiBaoPage
local parent
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)
function ZhenQiYiBaoPage:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
self.gameObject = gameObject
@ -47,7 +48,13 @@ function ZhenQiYiBaoPage:OnShow(_sortingOrder,_parent)
ZhenQiYiBaoPage:SetTime()
end
function ZhenQiYiBaoPage:OnShowData()
allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 23, "Type", GoodsTypeDef.DirectPurchaseGift)
allData={}
-- allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 23, "Type", GoodsTypeDef.DirectPurchaseGift)
local curActId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_Treasure)
for i = 1, #GlobalActivity[curActId].CanBuyRechargeId do
local data = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "Id", GlobalActivity[curActId].CanBuyRechargeId[i])
table.insert(allData,data)
end
if allData then
this.SortData(allData)
this.ScrollView:SetData(allData, function (index, go)
@ -62,7 +69,7 @@ function ZhenQiYiBaoPage:SetTime()
self.timer:Stop()
self.timer = nil
end
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_Treasure)
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.DynamicAct_Treasure)
local timeDown = endTime - GetTimeStamp()
this.time.text = Language[12321]..TimeToDHMS(timeDown)
self.timer = Timer.New(function()

View File

@ -24,7 +24,7 @@ public class UIBgAdaptive : MonoBehaviour
//float curHeight = 1920 * (Screen.height / Screen.width) / (1920 / 1080);
//float curWidth = (1080f / 1920f) * curHeight;
//bgList[i].GetComponent<RectTransform>().sizeDelta = new Vector2(curWidth, curHeight);
if (Screen.height > 1920)
if (Screen.height >= 1920)
{
float curWidth = (1080f / 1920f) * Screen.height;
//Debug.Log("Screen.height " + Screen.height+ " curWidth "+ curWidth);