Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
After Width: | Height: | Size: 4.3 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 73147b297ea4eb7428252f50962033f6
|
||||
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: 82e5050df48b67147955163d35c8ef84
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: HarmonyAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 4.3 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0023b31f212616f47af2ad09bad2f989
|
||||
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: 1f586577a45a6024d9ae700a22df701f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: HarmonyAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 4.5 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f4cd8fdf3c6e7bd41828021d347acf8d
|
||||
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: 163f9edfc4c7a854cafb3bd51ded375b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: HarmonyAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 4.2 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d9eb3ad3c4356064f98c7c2da4feb47b
|
||||
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: b1bc1c8f6f7349440b9245d248806c5b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: HarmonyAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 4.6 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 17c1aaee81eefe64ab3a352e0ccfb5e3
|
||||
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: ddc9a4b43ba1f584683cfbb25a8cf7db
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: HarmonyAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 4.4 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4dce17961b4727b41b5f9a22fc0d9c6d
|
||||
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: e7d348f7dbc0c9c4db48b9614b130c7d
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: HarmonyAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 4.7 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 345e0bffbb16e524b8e4a33d194f83b4
|
||||
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: a443c2f84ac96f249b426099bfaa24e0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: HarmonyAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -109,7 +109,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000051625524}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000045776367}
|
||||
m_SizeDelta: {x: 925.1, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2443668873975028990
|
||||
|
|
@ -333,7 +333,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0.000004479818, y: -0.000004901922}
|
||||
m_AnchoredPosition: {x: 0.000004479818, y: -0.000030517578}
|
||||
m_SizeDelta: {x: 924.2, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2775142083553738788
|
||||
|
|
@ -1906,7 +1906,7 @@ MonoBehaviour:
|
|||
m_Padding:
|
||||
m_Left: 80
|
||||
m_Right: 0
|
||||
m_Top: 93
|
||||
m_Top: 100
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: -9.98
|
||||
|
|
@ -1964,7 +1964,7 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_TargetGraphic: {fileID: 4074318518025181697}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
@ -2868,7 +2868,7 @@ MonoBehaviour:
|
|||
m_Padding:
|
||||
m_Left: 80
|
||||
m_Right: 0
|
||||
m_Top: 50
|
||||
m_Top: 80
|
||||
m_Bottom: 60
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 10
|
||||
|
|
|
|||
|
|
@ -1579,7 +1579,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: 51.699997, y: -0.78998345}
|
||||
m_AnchoredPosition: {x: 111.3, y: -0.78998345}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &867443612984388699
|
||||
|
|
@ -1612,18 +1612,18 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 45
|
||||
m_FontSize: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 45
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\xD71"
|
||||
m_Text: 15000
|
||||
--- !u!1 &2269723892978464456
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7082,7 +7082,7 @@ ParticleSystem:
|
|||
--- !u!199 &1856602151176858527
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -13044,7 +13044,7 @@ ParticleSystem:
|
|||
--- !u!199 &1472261994721625855
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -13626,7 +13626,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: -68.04, y: 0}
|
||||
m_AnchoredPosition: {x: -52.6, y: 0}
|
||||
m_SizeDelta: {x: 79.48, y: 65}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4357818227745408231
|
||||
|
|
@ -13659,7 +13659,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 38
|
||||
m_FontSize: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
|
@ -13785,7 +13785,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: 2.55, y: 0.77}
|
||||
m_AnchoredPosition: {x: -16.3, y: 0.77}
|
||||
m_SizeDelta: {x: 65, y: 65}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &805268058829116413
|
||||
|
|
@ -19553,7 +19553,7 @@ ParticleSystem:
|
|||
--- !u!199 &374364804466542659
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -24712,7 +24712,7 @@ ParticleSystem:
|
|||
--- !u!199 &1107171649523788123
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -30218,7 +30218,7 @@ ParticleSystem:
|
|||
--- !u!199 &8428054502987121459
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,79 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &717974134254947682
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3743595135909719998}
|
||||
- component: {fileID: 3243453562427216715}
|
||||
- component: {fileID: 3851650700008291432}
|
||||
m_Layer: 5
|
||||
m_Name: Image (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3743595135909719998
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 717974134254947682}
|
||||
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: 222024724411996248}
|
||||
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: 43.2, y: -28.65007}
|
||||
m_SizeDelta: {x: 379.4, y: 2.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3243453562427216715
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 717974134254947682}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3851650700008291432
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 717974134254947682}
|
||||
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: 0.25882354, g: 0.24313727, b: 0.27450982, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &840206674978318069
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -953,6 +1027,80 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &3636136740085529164
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 640834304260522301}
|
||||
- component: {fileID: 727597289740280820}
|
||||
- component: {fileID: 7445398275595482934}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &640834304260522301
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3636136740085529164}
|
||||
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: 222024724411996248}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 43.2, y: 26}
|
||||
m_SizeDelta: {x: 379.4, y: 2.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &727597289740280820
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3636136740085529164}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7445398275595482934
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3636136740085529164}
|
||||
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: 0.25882354, g: 0.24313727, b: 0.27450982, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3694198636868590846
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1027,6 +1175,88 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3943532452224250329
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 222024724411996248}
|
||||
- component: {fileID: 1935922215172751236}
|
||||
- component: {fileID: 5281393037349026581}
|
||||
m_Layer: 5
|
||||
m_Name: GradeText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &222024724411996248
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3943532452224250329}
|
||||
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: 640834304260522301}
|
||||
- {fileID: 3743595135909719998}
|
||||
m_Father: {fileID: 8372305284465964093}
|
||||
m_RootOrder: 7
|
||||
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: -420.1, y: 86}
|
||||
m_SizeDelta: {x: 206.9, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1935922215172751236
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3943532452224250329}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5281393037349026581
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3943532452224250329}
|
||||
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.7058824, g: 0.7921569, b: 0.80784315, 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: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9E3F\u8499\u9635\u7B49\u7EA7\uFF1A330/360"
|
||||
LanguageIndex: 10145
|
||||
--- !u!1 &4294327751025253158
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3574,6 +3804,8 @@ RectTransform:
|
|||
- {fileID: 7797542660600214350}
|
||||
- {fileID: 8864811839897291244}
|
||||
- {fileID: 4820278136986544220}
|
||||
- {fileID: 5245860039331634989}
|
||||
- {fileID: 222024724411996248}
|
||||
m_Father: {fileID: 7183224020379597708}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -3657,6 +3889,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6711657293456533807
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5245860039331634989}
|
||||
- component: {fileID: 26970790603631487}
|
||||
- component: {fileID: 2999249952491857369}
|
||||
m_Layer: 5
|
||||
m_Name: Image (2)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5245860039331634989
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6711657293456533807}
|
||||
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: 8372305284465964093}
|
||||
m_RootOrder: 6
|
||||
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: -363.1, y: 84.81}
|
||||
m_SizeDelta: {x: 370.1, y: 57.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &26970790603631487
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6711657293456533807}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2999249952491857369
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6711657293456533807}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 75857acfa9133a247a614d3db9217443, 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 &7116294893561557570
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -383,7 +383,7 @@ Language = {
|
|||
[10382] = GetLanguageStrById("对方已不在你的好友列表中,无法发送消息"),
|
||||
[10383] = GetLanguageStrById("%s元"),
|
||||
[10384] = GetLanguageStrById("未找到符合条件的节点"),
|
||||
[10385] = GetLanguageStrById("装备合成"),
|
||||
[10385] = GetLanguageStrById("神装升星"),
|
||||
[10386] = GetLanguageStrById("宝物合成"),
|
||||
[10387] = GetLanguageStrById("魂印合成"),
|
||||
[10388] = GetLanguageStrById("是否要将【"),
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
CompoundPanel = Inherit(BasePanel)
|
||||
local this = CompoundPanel
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local _TabData={ --[1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10385] , funcType = FUNCTION_OPEN_TYPE.COMPOUND},--装备暂时屏蔽
|
||||
local _TabData={ [1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10385] , funcType = FUNCTION_OPEN_TYPE.COMPOUND},
|
||||
--[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "宝器锻造" },
|
||||
[1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10387] , funcType = FUNCTION_OPEN_TYPE.hunyin},
|
||||
[2] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10386], funcType = FUNCTION_OPEN_TYPE.Treasure },
|
||||
[2] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10387] , funcType = FUNCTION_OPEN_TYPE.hunyin},
|
||||
[3] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10386], funcType = FUNCTION_OPEN_TYPE.Treasure },
|
||||
}
|
||||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1),
|
||||
|
|
@ -14,10 +14,10 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
|||
local curIndex = 1
|
||||
|
||||
this.contents = {
|
||||
--[1] = {view = require("Modules/Compound/view/CompoundPanel_Equip"), panelName = "CompoundPanel_Equip"},--装备暂时屏蔽
|
||||
[1] = {view = require("Modules/Compound/view/CompoundPanel_Equip"), panelName = "CompoundPanel_Equip"},
|
||||
--[2] = {view = require("Modules/Compound/view/CompoundPanel_Talisman"), panelName = "CompoundPanel_Talisman"},
|
||||
[1] = {view = require("Modules/Compound/view/CompoundPanel_SoulPrint"), panelName = "CompoundPanel_SoulPrint"},
|
||||
[2] = {view = require("Modules/Compound/view/CompoundPanel_Treasure"), panelName = "CompoundPanel_Treasure"},
|
||||
[2] = {view = require("Modules/Compound/view/CompoundPanel_SoulPrint"), panelName = "CompoundPanel_SoulPrint"},
|
||||
[3] = {view = require("Modules/Compound/view/CompoundPanel_Treasure"), panelName = "CompoundPanel_Treasure"},
|
||||
}
|
||||
--初始化组件(用于子类重写)
|
||||
function CompoundPanel:InitComponent()
|
||||
|
|
@ -49,18 +49,17 @@ function CompoundPanel:BindEvent()
|
|||
end
|
||||
|
||||
function CompoundPanel.RefreshHelpBtn()
|
||||
-- if curIndex==1 then
|
||||
-- this.HelpBtn:SetActive(true)
|
||||
-- Util.AddOnceClick(this.HelpBtn, function()
|
||||
-- UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EquipCompose,this.helpPosition.x,this.helpPosition.y)
|
||||
-- end)
|
||||
-- else
|
||||
if curIndex==1 then
|
||||
this.HelpBtn:SetActive(true)
|
||||
Util.AddOnceClick(this.HelpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EquipCompose,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
elseif curIndex==2 then
|
||||
this.HelpBtn:SetActive(true)
|
||||
Util.AddOnceClick(this.HelpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TreasureCompose,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
elseif curIndex==2 then
|
||||
elseif curIndex==3 then
|
||||
this.HelpBtn:SetActive(true)
|
||||
Util.AddOnceClick(this.HelpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.SoulPrintCommond,this.helpPosition.x,this.helpPosition.y)
|
||||
|
|
|
|||
|
|
@ -134,13 +134,14 @@ function this.ShowGoldNum0()
|
|||
end
|
||||
|
||||
function this:OnShow(...)
|
||||
curIndex = 1
|
||||
curIndex = 5
|
||||
sortingOrder =0
|
||||
needGoldNum=0
|
||||
this.TabCtrl = TabBox.New()
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
this.TabCtrl:SetChangeTabCallBack(this.SwitchView)
|
||||
this.TabCtrl:Init(this.tabBox, _TabData,curIndex)
|
||||
this.tabBox.gameObject:SetActive(false)
|
||||
end
|
||||
local sortingOrder = 0
|
||||
function this:OnSortingOrderChange(_sortingOrder)
|
||||
|
|
|
|||
|
|
@ -422,12 +422,12 @@ function this.GetAllGodEquips()
|
|||
local starEquips2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipConfig, "Quality", 8)
|
||||
local equips = {}
|
||||
for i = 1, #starEquips do
|
||||
if starEquips[i].Star and starEquips[i].Star > 0 and starEquips[i].Star ~= 1 then --最低等级的装备 合成不了
|
||||
if starEquips[i].Star and starEquips[i].Star > 0 and starEquips[i].Star ~= 18 then --最低等级的装备 合成不了
|
||||
table.insert(equips, starEquips[i])
|
||||
end
|
||||
end
|
||||
for i = 1, #starEquips2 do
|
||||
if starEquips2[i].Star and starEquips2[i].Star > 0 and starEquips2[i].Star ~= 1 then --最低等级的装备 合成不了
|
||||
if starEquips2[i].Star and starEquips2[i].Star > 0 and starEquips2[i].Star ~= 18 then --最低等级的装备 合成不了
|
||||
table.insert(equips, starEquips2[i])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ function HarmonyPanel:InitComponent()
|
|||
self.GongMingBtn = Util.GetGameObject(self.gameObject,"Panel/HarmonyPanel/KnowGongMing")
|
||||
self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition
|
||||
self.panel = Util.GetGameObject(self.gameObject,"Panel")
|
||||
|
||||
|
||||
self.GradeText = Util.GetGameObject(self.gameObject, "Panel/HarmonyPanel/GradeText"):GetComponent("Text")
|
||||
self.NumText = Util.GetGameObject(self.panel,"HarmonyPanel/itemNumText"):GetComponent("Text")
|
||||
self.parent = Util.GetGameObject(self.gameObject,"MiddleView")
|
||||
--初始化格子中的数据
|
||||
|
|
@ -106,6 +107,7 @@ function HarmonyPanel:OnOpen()
|
|||
|
||||
--格子
|
||||
|
||||
self.GradeText.text="鸿蒙阵等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, 330)
|
||||
for i = 1, #contents do
|
||||
contents[i].view:OnOpen(self.sortingOrder)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ function this:InitComponent()
|
|||
else
|
||||
this.logo.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
--this.logo.gameObject:SetActive(false)
|
||||
-- BindLightFlash(Util.GetGameObject(this.logo, "saoguang"), this.logo)
|
||||
|
||||
this.healthTip = Util.GetGameObject(this.gameObject, "healthTip")
|
||||
|
|
|
|||
|
|
@ -605,8 +605,10 @@ function this:BindEvent()
|
|||
Util.AddClick(this.btnEquipCompound, function()
|
||||
--JumpManager.GoJump(20003)
|
||||
--this.ScenceBtnClick(FUNCTION_OPEN_TYPE.SHOP)
|
||||
if ActTimeCtrlManager.IsQualifiled(66) then
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.COMPOUND) then
|
||||
UIManager.OpenPanel(UIName.CompoundPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.COMPOUND))
|
||||
end
|
||||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.COMPOUND)
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ local activityData
|
|||
local allValue=0
|
||||
local rewardTime=0
|
||||
local isCanGet=false
|
||||
local deleteTime=0
|
||||
local currShowRed=nil
|
||||
local rewardNum=0
|
||||
--初始化组件(用于子类重写)
|
||||
function GMSong10WanPanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
|
|
@ -28,7 +31,7 @@ function GMSong10WanPanel:InitComponent()
|
|||
this.scrollView.moveTween.MomentumAmount = 1
|
||||
this.scrollView.moveTween.Strength = 2
|
||||
this.itemList={}
|
||||
|
||||
this.timer = nil
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -42,6 +45,7 @@ function GMSong10WanPanel:BindEvent()
|
|||
UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1,function ()
|
||||
isCanGet=false
|
||||
this.getRed:SetActive(false)
|
||||
deleteTime=0
|
||||
self:OnShow()
|
||||
end)
|
||||
end)
|
||||
|
|
@ -81,6 +85,7 @@ function GMSong10WanPanel:OnShow()
|
|||
local lastState=-1
|
||||
local dayList={}
|
||||
if activityData then
|
||||
local maxId=0
|
||||
for i = 1,#activityData.mission do
|
||||
local id=activityData.mission[i].missionId
|
||||
if zhenchongConfig[id] then
|
||||
|
|
@ -89,8 +94,6 @@ function GMSong10WanPanel:OnShow()
|
|||
allValue=allValue+aaa.RewardValue
|
||||
if not dayList[aaa.day] then
|
||||
local day={}
|
||||
--table.insert(missionData,day)
|
||||
--table.insert(days,aaa.day)
|
||||
day.reward={}
|
||||
table.insert(day.reward,aaa.Reward)
|
||||
dayList[aaa.day]=day
|
||||
|
|
@ -101,6 +104,7 @@ function GMSong10WanPanel:OnShow()
|
|||
dayList[aaa.day].reward.state=state
|
||||
local progress=activityData.mission[i].progress
|
||||
if lastState~=0 and progress>=0 then
|
||||
maxId=id
|
||||
lineTime=progress
|
||||
if state==0 and rewardTime==0 then
|
||||
rewardTime=aaa.Time
|
||||
|
|
@ -112,14 +116,31 @@ function GMSong10WanPanel:OnShow()
|
|||
lastState=state
|
||||
end
|
||||
end
|
||||
LogError("#missionData==="..#dayList)
|
||||
LogError("linetime=="..lineTime)
|
||||
|
||||
|
||||
rewardNum=0
|
||||
this.timeTxt.text=""
|
||||
this.scrollView:SetData(dayList,function(index, rewardItem)
|
||||
this:UpdateSingleInfo(rewardItem, dayList[index],index)
|
||||
this:UpdateSingleInfo(rewardItem, dayList[index],index)
|
||||
end,not false,not false)
|
||||
this.scrollView:SetIndex(maxId/4)
|
||||
if deleteTime>0 then
|
||||
this.timer = Timer.New(function ()
|
||||
--LogError("needTime=="..needTime)
|
||||
deleteTime= deleteTime-1
|
||||
if deleteTime<=0 then
|
||||
isCanGet=true
|
||||
this.timeTxt.text = "有可领取奖励"
|
||||
this.getRed:SetActive(true)
|
||||
currShowRed:SetActive(true)
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
else
|
||||
this.timeTxt.text = string.format("领取倒计时:".."%s",TimeToFelaxible(deleteTime))
|
||||
end
|
||||
end,1,-1,true)
|
||||
this.timer:Start()
|
||||
end
|
||||
end
|
||||
|
||||
this.getRed:SetActive(isCanGet)
|
||||
this.noGetTxt.text=string.format("未领取:<color=#2DBD11>%s</color>元",allValue-activityData.value)
|
||||
end
|
||||
|
|
@ -131,9 +152,14 @@ function this:UpdateSingleInfo(go,data,index)
|
|||
if not this.itemList[go] then
|
||||
this.itemList[go] = {}
|
||||
end
|
||||
if this.timer then
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
end
|
||||
for i = 1, #this.itemList[go] do
|
||||
this.itemList[go][i].go.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
for i = 1, #data.reward do
|
||||
if not this.itemList[go][i] then
|
||||
this.itemList[go][i]={}
|
||||
|
|
@ -144,7 +170,6 @@ function this:UpdateSingleInfo(go,data,index)
|
|||
this.itemList[go][i].out=Util.GetGameObject(this.itemList[go][i].go, "guoqi")
|
||||
this.itemList[go][i].name=Util.GetGameObject(this.itemList[go][i].go, "name")
|
||||
this.itemList[go][i].itemView= SubUIManager.Open(SubUIConfig.ItemView,this.itemList[go][i].pos.transform)
|
||||
|
||||
end
|
||||
this.itemList[go][i].go.gameObject:SetActive(true)
|
||||
this.itemList[go][i].red:SetActive(false)
|
||||
|
|
@ -160,55 +185,51 @@ function this:UpdateSingleInfo(go,data,index)
|
|||
--LogError("state====="..state)
|
||||
if state==0 then
|
||||
if progress~=-1 then
|
||||
if this.timer then
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
end
|
||||
local cha= tonumber(GetTimeStamp()-ActivityGiftManager.loginTime)
|
||||
local needTime=config.Time- (lineTime+cha)
|
||||
LogError("needTime=="..needTime)
|
||||
this.getRed:SetActive(false)
|
||||
if needTime>=0 then
|
||||
if needTime>0 and deleteTime==0 then
|
||||
this.timeTxt.gameObject:SetActive(true)
|
||||
this.timer = Timer.New(function ()
|
||||
--LogError("needTime=="..needTime)
|
||||
needTime=needTime-1
|
||||
if needTime<=0 then
|
||||
isCanGet=true
|
||||
this.timeTxt.text = "有可领取奖励"
|
||||
this.getRed:SetActive(true)
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
this.itemList[go][i].red:SetActive(true)
|
||||
else
|
||||
this.timeTxt.text = string.format("领取倒计时:".."%s",TimeToFelaxible(needTime))
|
||||
end
|
||||
|
||||
end,1,-1,true)
|
||||
this.timer:Start()
|
||||
else
|
||||
deleteTime=needTime
|
||||
currShowRed=this.itemList[go][i].red
|
||||
--this.timeTxt.gameObject:SetActive(false)
|
||||
end
|
||||
if needTime<=0 then
|
||||
if rewardTime~=0 then
|
||||
isCanGet=true
|
||||
this.itemList[go][i].red:SetActive(true)
|
||||
end
|
||||
this.timeTxt.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
elseif state==1 then
|
||||
this.itemList[go][i].red:SetActive(true)
|
||||
elseif state==2 then
|
||||
this.itemList[go][i].get:SetActive(true)
|
||||
rewardNum=rewardNum+1
|
||||
elseif state==3 then
|
||||
this.itemList[go][i].out:SetActive(true)
|
||||
end
|
||||
end
|
||||
--LogError("deleteTime==="..deleteTime)
|
||||
end
|
||||
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function GMSong10WanPanel:OnClose()
|
||||
if this.timer then
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
end
|
||||
allValue=0
|
||||
rewardTime=0
|
||||
deleteTime=0
|
||||
rewardNum=0
|
||||
this.getRed:SetActive(false)
|
||||
if currShowRed then
|
||||
currShowRed:SetActive(false)
|
||||
currShowRed=nil
|
||||
end
|
||||
|
||||
CheckRedPointStatus(RedPointType.song10Wan)
|
||||
end
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
@ -217,6 +238,6 @@ function GMSong10WanPanel:OnDestroy()
|
|||
if this.timer then
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
return GMSong10WanPanel
|
||||
|
|
@ -122,13 +122,13 @@ function this.BackSetMonthCardGetStateData(datas)
|
|||
monthCardData[i].state=1
|
||||
end
|
||||
end
|
||||
if datas[i] then
|
||||
-- monthCardData[i].state=0
|
||||
LogError("66666666666")
|
||||
end
|
||||
if PlayerManager.serverTime>=monthCardData[i].endingTime then
|
||||
monthCardData[i].state=0
|
||||
end
|
||||
-- if datas[i] then
|
||||
-- -- monthCardData[i].state=0
|
||||
-- LogError("66666666666")
|
||||
-- end
|
||||
-- if PlayerManager.serverTime>=monthCardData[i].endingTime then
|
||||
-- monthCardData[i].state=0
|
||||
-- end
|
||||
end
|
||||
--事件
|
||||
CheckRedPointStatus(RedPointType.MonthCard)
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五
|
|||
PlayerPrefs.SetInt(PlayerManager.uid.."piaomiaozhilv", 0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen,0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."kaifuchongbang",0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."lingShouBaoGe",0)
|
||||
end
|
||||
|
||||
if var == 1 then
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ function this:OnOpen(rewardGroup)
|
|||
itemListPrefab[index] = view
|
||||
index=index+1
|
||||
view:OnOpen(false,{itemData.itemId,itemData.itemNum},1.15,true,false,false,self.sortingOrder)
|
||||
local str=string.format("获取概率:%s%%",itemData.weight/ winData[i].allWeight*100)
|
||||
local str=string.format("获取概率:%s%%",math.modf(itemData.weight/ winData[i].allWeight*100))
|
||||
view:ResetName(str)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function RewardItemSingleShowPopup:OnOpen(...)
|
||||
isBagPanel = BagManager.isBagPanel
|
||||
|
||||
itemNu = 0
|
||||
local data = { ... }
|
||||
itemSid = data[1]
|
||||
|
|
@ -349,6 +349,7 @@ function RewardItemSingleShowPopup:OnOpen(...)
|
|||
isNoShowSureBtn = data[4] and data[4] or false
|
||||
end
|
||||
function RewardItemSingleShowPopup:OnShow()
|
||||
isBagPanel = BagManager.isBagPanel
|
||||
this.helpBtn.gameObject:SetActive(false)
|
||||
this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name))
|
||||
this.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemConfigData.Quantity)
|
||||
|
|
@ -394,25 +395,29 @@ function RewardItemSingleShowPopup:OnShow()
|
|||
then
|
||||
this.btnSureText.text = Language[10193]
|
||||
this.btnSure:SetActive(true)
|
||||
elseif isBagPanel and (itemConfigData.ItemType == ItemType.GMzck
|
||||
elseif isBagPanel and func and
|
||||
(itemConfigData.ItemType == ItemType.GMzck
|
||||
or itemConfigData.ItemType == ItemType.GMBigZck
|
||||
or itemConfigData.ItemType == ItemType.GMzcq)
|
||||
or itemConfigData.ItemType == ItemType.GMzcq
|
||||
or itemConfigData.ItemType == ItemType.GMxck
|
||||
or itemConfigData.ItemType == ItemType.GMxjk
|
||||
or itemConfigData.ItemType == ItemType.GMxsZcq and func then--是否宝箱可使用
|
||||
or itemConfigData.ItemType == ItemType.GMxsZcq
|
||||
or itemConfigData.ItemType == ItemType.GMxjk)
|
||||
then
|
||||
this.btnSure:SetActive(true)
|
||||
this.btnSureText.text = Language[10195]
|
||||
elseif isBagPanel and itemConfigData.ItemType == 10 and func then
|
||||
elseif isBagPanel and itemConfigData.ItemType == ItemType.Box and func then
|
||||
this.btnSure:SetActive(true)
|
||||
this.btnSureText.text = Language[10195]
|
||||
this.helpBtn.gameObject:SetActive(true)
|
||||
elseif isBagPanel and itemConfigData.ItemType == 12 and func then-- 改名卡
|
||||
if itemConfigData.HeroStar and itemConfigData.HeroStar[1]==1 then
|
||||
this.helpBtn.gameObject:SetActive(true)
|
||||
end
|
||||
elseif isBagPanel and itemConfigData.ItemType == ItemType.ChangeName and func then-- 改名卡
|
||||
this.btnSure:SetActive(true)
|
||||
this.btnSureText.text = Language[10195]
|
||||
elseif isBagPanel and itemConfigData.ItemType == 32 then -- 挂机奖励
|
||||
elseif isBagPanel and itemConfigData.ItemType == ItemType.TimeIsGold then -- 挂机奖励
|
||||
this.btnSure:SetActive(true)
|
||||
this.btnSureText.text = Language[10195]
|
||||
elseif isBagPanel and itemConfigData.ItemType == 34 then
|
||||
elseif isBagPanel and itemConfigData.ItemType == ItemType.GodPrint then
|
||||
this.btnSure:SetActive(false)
|
||||
else
|
||||
this.btnSure:SetActive(false)
|
||||
|
|
@ -619,6 +624,7 @@ function this.SendBackResolveReCallBack(drop, curResolveAllItemList)
|
|||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function RewardItemSingleShowPopup:OnClose()
|
||||
isBagPanel=false
|
||||
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout = false
|
||||
if this.jumpViewList and #this.jumpViewList > 0 then
|
||||
for i = 1,#this.jumpViewList do
|
||||
|
|
|
|||
|
|
@ -388,10 +388,9 @@ function RewardTalismanSingleShowPopup2:SetSkillShow(_infos,_preList,_grid,_lv)
|
|||
local index=1
|
||||
for key, value in pairs(_infos) do
|
||||
local obj=_preList[index]
|
||||
LogError("key===="..key)
|
||||
local proper=passiveSkillConfig[value.id]
|
||||
local str=""
|
||||
if value.lv<_lv then
|
||||
if value.lv<=_lv then
|
||||
str="<color=#66FF00>"..proper.Desc.." (精炼"..value.lv.."级解锁)".."</color>"
|
||||
else
|
||||
str="<color=#828282>"..proper.Desc.." (精炼"..value.lv.."级解锁)".."</color>"
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ function this:BindEvent()
|
|||
end)
|
||||
end)
|
||||
Util.AddClick(this.boxBtn,function()
|
||||
UIManager.OpenPanel(UIName.RewardBoxPanel,nil,81185)
|
||||
UIManager.OpenPanel(UIName.RewardBoxPanel,nil,81182)
|
||||
end)
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@ function this.RefreshPanel()
|
|||
end
|
||||
local _curData={}
|
||||
for k,v in pairs(curHeroData.RecommendTeamId) do
|
||||
local _data=ConfigManager.GetConfigData(ConfigName.RecommendTeam,v)
|
||||
if _data.IsShowInTeam==1 then
|
||||
local _data=ConfigManager.TryGetConfigData(ConfigName.RecommendTeam,v)
|
||||
if _data and _data.IsShowInTeam==1 then
|
||||
table.insert(_curData,_data)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -106,12 +106,21 @@ function this.CheckRedPointLingLong()
|
|||
if not id or id < 1 then
|
||||
return false
|
||||
end
|
||||
|
||||
local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,117)
|
||||
local strs = string.split(config.Value,"|")
|
||||
local costId = tonumber(strs[1])
|
||||
if BagManager.GetItemCountById(costId) > 0 then
|
||||
return true
|
||||
end
|
||||
local state=PlayerPrefs.GetInt(PlayerManager.uid.."lingShouBaoGe")
|
||||
if state==0 then
|
||||
return true
|
||||
end
|
||||
local isBuy=OperatingManager.IsBuyGift(20017)
|
||||
if not isBuy then
|
||||
return true
|
||||
end
|
||||
local actconfigs = ActivityGiftManager.GetActivityInfoByType(id)
|
||||
for i = 1,#actconfigs.mission do
|
||||
local config = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,actconfigs.mission[i].missionId)
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ function LingLongBaoJingPanel:InitComponent(gameObject)
|
|||
-- 奖励预览
|
||||
self.btnPreview = Util.GetGameObject(self.gameObject, "button/previewBtn")
|
||||
self.shopBtn = Util.GetGameObject(self.gameObject, "button/shopBtn")
|
||||
self.shopRed = Util.GetGameObject(self.gameObject, "button/shopBtn/red")
|
||||
self.helpBtn = Util.GetGameObject(self.luckyTurnPanel,"button/helpBtn")
|
||||
self.helpPosition = Util.GetGameObject(self.luckyTurnPanel,"BG/helpPos"):GetComponent("RectTransform").localPosition
|
||||
|
||||
|
|
@ -154,6 +155,7 @@ function LingLongBaoJingPanel:BindEvent()
|
|||
|
||||
Util.AddClick(self.shopBtn, function()
|
||||
JumpManager.GoJump(40036)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."lingShouBaoGe",1)
|
||||
end)
|
||||
|
||||
Util.AddClick(self.skip, function()
|
||||
|
|
@ -285,6 +287,8 @@ function LingLongBaoJingPanel:RemoveListener()
|
|||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.RefreshProgress1,self)
|
||||
end
|
||||
|
||||
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function LingLongBaoJingPanel:OnOpen(_activityConfig,_index,parent)
|
||||
self.actConfig = _activityConfig
|
||||
|
|
@ -318,7 +322,7 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder)
|
|||
end
|
||||
end
|
||||
self.turnEffect = Timer.New()
|
||||
|
||||
self.shopRed:SetActive(PlayerPrefs.GetInt(PlayerManager.uid.."lingShouBaoGe")==0 or not OperatingManager.IsBuyGift(20017))
|
||||
self:RefreshTreasureType()
|
||||
self:DelayMaskWithTime(0.5)
|
||||
self:SetPropShow()
|
||||
|
|
@ -336,6 +340,7 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder)
|
|||
self.shopBtn:SetActive(not not act)
|
||||
end
|
||||
|
||||
|
||||
function LingLongBaoJingPanel:SetLayer()
|
||||
self.firstLayer.overrideSorting = true
|
||||
self.firstLayer.sortingOrder = self.sortingOrder
|
||||
|
|
|
|||
|
|
@ -32,8 +32,9 @@ function PlayerInfoView:InitComponent()
|
|||
self.vipRedPoint = Util.GetGameObject(self.gameObject, "vipPrivilege/vipPrivilegeBtn/redPoint")
|
||||
--名望
|
||||
self.btn_mingwang=Util.GetGameObject(self.gameObject, "btn_mingwang")
|
||||
self.mwLvTxt=Util.GetGameObject(self.gameObject, "btn_mingwang/Text"):GetComponent("Text")
|
||||
self.mwLvTxt=Util.GetGameObject(self.gameObject, "btn_mingwang/Text"):GetComponent("Image")
|
||||
self.mwRed=Util.GetGameObject(self.gameObject, "btn_mingwang/red")
|
||||
self.mwEffect=Util.GetGameObject(self.gameObject, "btn_mingwang/saoguang")
|
||||
screenAdapte(self.vipPrivilegeBtn)
|
||||
|
||||
end
|
||||
|
|
@ -102,7 +103,7 @@ function PlayerInfoView:OnShow()
|
|||
self.playName.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel)
|
||||
self.vipLevelText.sprite = self.spLoader:LoadSprite(VipManager.SetVipLevelImg())
|
||||
|
||||
self.mwLvTxt.text=DynamicActivityManager.curLevel
|
||||
self.mwLvTxt.sprite=self.spLoader:LoadSprite("r_zjm_tequanpaizi_0" ..DynamicActivityManager.curLevel.."_zh")
|
||||
self.mwRed:SetActive(false)
|
||||
if not self.playerHead then
|
||||
self.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, self.headPos.transform)
|
||||
|
|
@ -140,7 +141,7 @@ function PlayerInfoView:SetLayer(sortingOrder)
|
|||
if self.playerHead then
|
||||
self.playerHead:SetLayer(sortingOrder)
|
||||
end
|
||||
|
||||
SetParticleSortLayer(self.mwEffect,sortingOrder)
|
||||
self.orginLayer = sortingOrder
|
||||
end
|
||||
|
||||
|
|
|
|||