Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts: # Assets/ManagedResources/~Lua/Data/ConfigData.lua # Assets/ManagedResources/~Lua/Data/UIData.luadev_chengFeng
After Width: | Height: | Size: 115 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d2f45cb462ee32146a6cfac57a036162
|
||||
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: 07b27196b1113354f851f713f843b362
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 29 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 02c65ae47d2194346a31595fe141bf79
|
||||
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: 081294efb00b76247ab4efd1c7926245
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 28 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 441198582ade1e140940dedfa58a5c40
|
||||
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: 453d045a138825047baa481d53c55988
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 156 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 093fcf43de68de3468ea0dc53216083e
|
||||
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: a852b150562bb0b449704e4875f88c8e
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 121 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3bed3b56aca463442af35f900bc19dcc
|
||||
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: e444f37695d4d3b4391ea1202ef690c8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 99 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 268e7d0495fa86b41bb4e5ee3d239cdf
|
||||
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: 7374c5cda79d06e44b58135bc5699919
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 3.6 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f61e7054e4c50504c8fe4b6dde9f2f8c
|
||||
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: c2e899811959dea488ca4340a1f1d39c
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 122 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 73ab77ec96335e747946f2a23d5efedd
|
||||
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: c99992967df85e74eb491dbf6ce07edb
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 731 B |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b95fadc0821875249bb822ccfe9a9056
|
||||
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: 175db7854512a7448b2a0a82645da355
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 398 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 98c0661898384464aa0372b59e5e07ab
|
||||
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: e3d09697ad0537c41a47f90c89c5f0a0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 85364d540938d5c4a83ee3fcbfa786f3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cb829297157539143a5362e69e9d7984
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,10 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b4379b2ea6510f64686357ba5c3ec6ee
|
||||
timeCreated: 1551705342
|
||||
licenseType: Pro
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
@ -165,6 +165,8 @@ ConfigName = {
|
|||
ExpeditionRecruitConfig = "ExpeditionRecruitConfig",
|
||||
FreeTravel="FreeTravel",
|
||||
FreeTravelStore="FreeTravelStore",
|
||||
GodSacrificeConfig = "GodSacrificeConfig",
|
||||
GodSacrificeSetting = "GodSacrificeSetting",
|
||||
}
|
||||
|
||||
require "Framework/GameDataBase"
|
||||
|
|
|
@ -334,6 +334,7 @@ UIName = {
|
|||
GuildTranscriptRewardSortPanel = 333,--公会副本奖励排行
|
||||
GuideBattlePanel = 334, --引导战斗
|
||||
DemonSlayerPanel = 335,--三界除魔
|
||||
GeneralRankRewardPanel = 336,--通用排行奖励界面
|
||||
XiaoYaoYouPanel=337, --逍遥游入口界面
|
||||
XiaoYaoMapPanel=338, --逍遥游入口界面
|
||||
XiaoyaoHeroGetPopup = 344 , --逍遥游购买神将
|
||||
|
|
|
@ -16,8 +16,7 @@ local _TabData = {
|
|||
-- 内容数据
|
||||
local _ViewData = {
|
||||
[1] = {script = "Modules/Arena/View/ArenaView"},
|
||||
-- [2] = {script = "Modules/Arena/View/RankView"},
|
||||
[2] = {script = "Modules/Arena/View/RewardView"},
|
||||
-- [2] = {script = "Modules/Arena/View/RewardView"},
|
||||
}
|
||||
|
||||
|
||||
|
@ -29,8 +28,7 @@ function ArenaMainPanel:InitComponent()
|
|||
|
||||
this.ViewList = {}
|
||||
this.ViewList[1] = Util.GetGameObject(self.gameObject, "content/ArenaView")
|
||||
-- this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RankView")
|
||||
this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RewardView")
|
||||
-- this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RewardView")
|
||||
|
||||
this.ViewLogicList = {}
|
||||
|
||||
|
@ -122,10 +120,11 @@ function this.TabAdapter(tab, index, status)
|
|||
txt:GetComponent("Text").color = _TabFontColor[status]
|
||||
|
||||
-- 判断是否需要检测红点
|
||||
local redpot = Util.GetGameObject(tab, "redpot")
|
||||
if index == 3 then
|
||||
BindRedPointObject(RedPointType.Arena_Shop, redpot)
|
||||
end
|
||||
-- local redpot = Util.GetGameObject(tab, "redpot")
|
||||
-- if index == 3 then
|
||||
-- BindRedPointObject(RedPointType.Arena_Shop, redpot)
|
||||
-- end
|
||||
|
||||
end
|
||||
|
||||
-- tab改变回调事件
|
||||
|
@ -140,16 +139,18 @@ end
|
|||
function this.OpenView(index)
|
||||
this._CurLogicIndex = index
|
||||
this._CurTabIndex = index
|
||||
|
||||
this.tabbox:SetActive(index ~= 1)--竞技场界面关闭tabbox
|
||||
-- 商店界面特殊处理
|
||||
if index == 3 then
|
||||
if not this.shopView then
|
||||
this.shopView = SubUIManager.Open(SubUIConfig.ShopView, this.content.transform)
|
||||
end
|
||||
this.shopView.gameObject:SetActive(true)
|
||||
this.shopView:ShowShop(SHOP_TYPE.ARENA_SHOP, this.sortingOrder)
|
||||
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ArenaShop })
|
||||
return
|
||||
end
|
||||
-- if index == 3 then
|
||||
-- if not this.shopView then
|
||||
-- this.shopView = SubUIManager.Open(SubUIConfig.ShopView, this.content.transform)
|
||||
-- end
|
||||
-- this.shopView.gameObject:SetActive(true)
|
||||
-- this.shopView:ShowShop(SHOP_TYPE.ARENA_SHOP, this.sortingOrder)
|
||||
-- this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ArenaShop })
|
||||
-- return
|
||||
-- end
|
||||
|
||||
local logic = this.ViewLogicList[index]
|
||||
if not logic then
|
||||
|
|
|
@ -1,17 +1,18 @@
|
|||
local ArenaView = {}
|
||||
local this = ArenaView
|
||||
local rewardBoxBtn = {}
|
||||
local myRank
|
||||
local arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward)
|
||||
local arenaReward = ConfigManager.GetConfig(ConfigName.ArenaReward)
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
--初始化组件(用于子类重写)
|
||||
function ArenaView:InitComponent()
|
||||
this.ArenaName = Util.GetGameObject(self.gameObject, "name")
|
||||
this.ArenaTime = Util.GetGameObject(self.gameObject, "time")
|
||||
this.Integral = Util.GetGameObject(self.gameObject, "integral")
|
||||
this.WinNums = Util.GetGameObject(self.gameObject, "winNum")
|
||||
this.FailNums = Util.GetGameObject(self.gameObject, "loseNum")
|
||||
this.WinRate = Util.GetGameObject(self.gameObject, "winRate")
|
||||
this.AllNums = Util.GetGameObject(self.gameObject, "allNum")
|
||||
-- this.HelpBtn=Util.GetGameObject(self.gameObject,"btn")
|
||||
this.DailyReward = Util.GetGameObject(self.gameObject, "finalTarget/Reward/dailyReward"):GetComponent("Text")
|
||||
this.SeasonReward = Util.GetGameObject(self.gameObject, "finalTarget/Reward/seasonReward"):GetComponent("Text")
|
||||
this.content = Util.GetGameObject(self.gameObject, "content")
|
||||
this.ArenaName = Util.GetGameObject(self.gameObject, "nameImg/name")
|
||||
this.ArenaTime = Util.GetGameObject(self.gameObject, "timelab")
|
||||
this.Integral = Util.GetGameObject(self.gameObject, "myScore/integral")
|
||||
|
||||
this.FormationBtn = Util.GetGameObject(self.gameObject, "formationBtn")
|
||||
--this.DiffDemons = {}
|
||||
|
@ -24,15 +25,17 @@ function ArenaView:InitComponent()
|
|||
end
|
||||
|
||||
this.Enemys = {}
|
||||
for i = 1, 5 do
|
||||
for i = 1, 4 do
|
||||
table.insert(this.Enemys, Util.GetGameObject(self.gameObject, "challengebox/enemy_"..i))
|
||||
end
|
||||
|
||||
|
||||
this.RecordBtn = Util.GetGameObject(self.gameObject, "record")
|
||||
this.RefreshBtn = Util.GetGameObject(self.gameObject, "refresh")
|
||||
this.sortBtn = Util.GetGameObject(self.gameObject, "sortBtn")
|
||||
this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||
this.RecordBtn = Util.GetGameObject(self.gameObject, "rightUp/record")
|
||||
this.RefreshBtn = Util.GetGameObject(self.gameObject, "rightUp/refresh")
|
||||
this.RewardBtn = Util.GetGameObject(self.gameObject, "rightUp/reward")
|
||||
this.StoreBtn = Util.GetGameObject(self.gameObject, "rightUp/store")
|
||||
this.sortBtn = Util.GetGameObject(self.gameObject, "rightUp/sortBtn")
|
||||
this.helpBtn = Util.GetGameObject(self.gameObject, "rightUp/helpBtn")
|
||||
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
|
||||
|
||||
this.myRank=Util.GetGameObject(self.gameObject,"MyRank")
|
||||
|
@ -86,7 +89,6 @@ function ArenaView:BindEvent()
|
|||
-- 敌方数据获取
|
||||
local EnemyList = ArenaManager.GetEnemyList()
|
||||
if EnemyList[i] then
|
||||
-- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.ARENA_ATTACK, i)
|
||||
--直接主线阵容进战斗
|
||||
-- 请求开始挑战
|
||||
local isSkip = 0--ArenaManager.IsSkipFight() and 1 or 0
|
||||
|
@ -123,6 +125,18 @@ function ArenaView:BindEvent()
|
|||
Util.AddClick(this.helpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Arena,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
-- 奖励按钮
|
||||
Util.AddClick(this.RewardBtn, function()
|
||||
UIManager.OpenPanel(UIName.GeneralRankRewardPanel,3,myRank)
|
||||
end)
|
||||
--商店按钮
|
||||
Util.AddClick(this.StoreBtn, function()
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
|
||||
PopupTipPanel.ShowTip(Language[10082])
|
||||
return
|
||||
end
|
||||
JumpManager.GoJump(20010)
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
@ -175,17 +189,43 @@ function ArenaView:OnOpen( sortingOrder )
|
|||
this.delayRefresh = nil
|
||||
end, 1)
|
||||
this.delayRefresh:Start()
|
||||
|
||||
this.RefreshReward()
|
||||
end
|
||||
|
||||
-- 刷新排名信息
|
||||
function this.RefreshRankInfo()
|
||||
local _, myRankInfo = ArenaManager.GetRankInfo()
|
||||
local myRank = myRankInfo.personInfo.rank
|
||||
myRank = myRankInfo.personInfo.rank
|
||||
if myRank<0 then
|
||||
myRank=Language[10041]
|
||||
end
|
||||
this.rank.text=Language[10101]..myRank.."</color>"
|
||||
this.power.text=Language[10102]..myRankInfo.personInfo.totalForce.."</color>"
|
||||
this.rank.text="排名:"..myRank
|
||||
this.power.text=myRankInfo.personInfo.totalForce
|
||||
end
|
||||
|
||||
-- 刷新奖励信息
|
||||
function this.RefreshReward()
|
||||
if tonumber(myRank) and tonumber(myRank) > 0 then
|
||||
for k,value in ConfigPairs(arenaReward) do
|
||||
if myRank <= 3 then
|
||||
this.DailyReward.text = "每日奖励: "..itemConfig[arenaReward[myRank].DailyReward[1][1]].Name.."<color=green>+"..arenaReward[myRank].DailyReward[1][2].."</color>"..
|
||||
itemConfig[arenaReward[myRank].DailyReward[1][1]].Name.."<color=green>+"..arenaReward[myRank].DailyReward[1][2].."</color>"
|
||||
this.SeasonReward.text = "赛季奖励: "..itemConfig[arenaReward[myRank].SeasonReward[2][1]].Name.."<color=green>+"..arenaReward[myRank].SeasonReward[2][2].."</color>"..
|
||||
itemConfig[arenaReward[myRank].SeasonReward[2][1]].Name.."<color=green>+"..arenaReward[myRank].SeasonReward[2][2].."</color>"
|
||||
else
|
||||
-- LogRed("myrank:"..myRank.." value.MinRank:"..tostring(value.MinRank).." value.MinRank:"..tostring(value.MaxRank))
|
||||
if myRank>=value.MinRank and myRank <= value.MaxRank then
|
||||
this.DailyReward.text = "每日奖励: "..itemConfig[value.DailyReward[1][1]].Name.."<color=green>+"..value.DailyReward[1][2].."</color>"..itemConfig[value.DailyReward[2][1]].Name.."<color=green>+"..value.DailyReward[2][2].."</color>"
|
||||
this.SeasonReward.text = "赛季奖励: "..itemConfig[value.SeasonReward[1][1]].Name.."<color=green>+"..value.SeasonReward[1][2].."</color>"..itemConfig[value.SeasonReward[2][1]].Name.."<color=green>+"..value.SeasonReward[2][2].."</color>"
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
this.DailyReward.text = "每日奖励: 暂无排名"
|
||||
this.SeasonReward.text = "赛季奖励: 暂无排名"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
-- 刷新防守编队显示
|
||||
|
@ -207,31 +247,6 @@ function this.RefreshDefendFormation()
|
|||
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
end
|
||||
|
||||
|
||||
--for i, demon in ipairs(this.Demons) do
|
||||
-- if formation.teamHeroInfos[i] then
|
||||
-- demon:SetActive(true)
|
||||
-- local demonId = formation.teamHeroInfos[i].heroId
|
||||
-- local demonData = HeroManager.GetSingleHeroData(demonId)
|
||||
-- demon:GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(demonData.heroConfig.Quality))
|
||||
-- Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(demonData.icon)
|
||||
-- else
|
||||
-- demon:SetActive(false)
|
||||
-- end
|
||||
--end
|
||||
|
||||
-- 异妖
|
||||
--for i, diffDemon in ipairs(this.DiffDemons) do
|
||||
-- if formation.teamPokemonInfos[i] then
|
||||
-- diffDemon:SetActive(true)
|
||||
-- local demonId = formation.teamPokemonInfos[i].pokemonId
|
||||
-- ---TODO: 异妖条状头像资源未配置,配置后增加根据ID获取资源名称
|
||||
-- local resId = ConfigManager.GetConfigData(ConfigName.DifferDemonsConfig, demonId).LiveIcon
|
||||
-- diffDemon:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(resId))
|
||||
-- else
|
||||
-- diffDemon:SetActive(false)
|
||||
-- end
|
||||
--end
|
||||
end
|
||||
|
||||
-- 刷新基础数据显示
|
||||
|
@ -243,20 +258,32 @@ function this.RefreshBaseData()
|
|||
if allNums ~= 0 then
|
||||
rate = math.floor(baseData.successNums / allNums * 100)
|
||||
end
|
||||
this.Integral:GetComponent("Text").text = baseData.score
|
||||
this.AllNums:GetComponent("Text").text = allNums
|
||||
this.WinNums:GetComponent("Text").text = baseData.successNums
|
||||
this.FailNums:GetComponent("Text").text = baseData.failNums
|
||||
this.WinRate:GetComponent("Text").text = "("..rate.."%)"
|
||||
this.Integral:GetComponent("Text").text = "积分: "..baseData.score
|
||||
end
|
||||
|
||||
|
||||
-- 开始计时
|
||||
function this.StartCountTime()
|
||||
local dayText = Util.GetGameObject(this.ArenaTime,"day"):GetComponent("Text")
|
||||
local hourText = Util.GetGameObject(this.ArenaTime,"hour"):GetComponent("Text")
|
||||
local minText = Util.GetGameObject(this.ArenaTime,"min"):GetComponent("Text")
|
||||
local secText = Util.GetGameObject(this.ArenaTime,"sec"):GetComponent("Text")
|
||||
|
||||
local second = ArenaManager.GetLeftTime()
|
||||
|
||||
if this.TimeCounter then return end
|
||||
local function _TimeUpdate()
|
||||
local leftTime = ArenaManager.GetLeftTime()
|
||||
this.ArenaTime:GetComponent("Text").text = TimeToHMS(leftTime)
|
||||
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)
|
||||
|
||||
dayText.text = day
|
||||
minText.text = minute
|
||||
secText.text = sec
|
||||
hourText.text = hour
|
||||
|
||||
second = second -1
|
||||
end
|
||||
_TimeUpdate()
|
||||
this.TimeCounter = Timer.New(_TimeUpdate, 1, -1, true)
|
||||
|
@ -347,7 +374,7 @@ function this.ShowRewardBoxProgressData()
|
|||
Util.GetGameObject(rewardBoxBtn[i], "getFinish"):SetActive(state == 3)
|
||||
Util.AddOnceClick(rewardBoxBtn[i], function()
|
||||
if state == 1 then
|
||||
UIManager.OpenPanel(UIName.BoxRewardShowPopup,arenaBattleReward[i].Reward,rewardBoxBtn[i].transform.localPosition.x,-937,arenaBattleReward[i].BattleTimes .. Language[12205])
|
||||
UIManager.OpenPanel(UIName.BoxRewardShowPopup,arenaBattleReward[i].Reward,rewardBoxBtn[i].transform.localPosition.x,-400,arenaBattleReward[i].BattleTimes .. Language[12205])
|
||||
return
|
||||
elseif state == 3 then
|
||||
PopupTipPanel.ShowTip(Language[10350])
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1e86f558aacf38c4cac92d0530801a67
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,295 @@
|
|||
require("Base/BasePanel")
|
||||
GeneralRankRewardPanel = Inherit(BasePanel)
|
||||
local this = GeneralRankRewardPanel
|
||||
local RewardList
|
||||
local GloActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
local arenaReward = ConfigManager.GetConfig(ConfigName.ArenaReward)
|
||||
local RewardConfig
|
||||
local itemList = {}--优化itemView使用
|
||||
local itemList2 = {}--优化itemView使用
|
||||
local sorting = 0
|
||||
local curRankType = 1
|
||||
local tabNum = 1
|
||||
local myrank = nil
|
||||
local ConfigList = {
|
||||
[1] = ConfigManager.GetConfig(ConfigName.ActivityRankingReward),--一般奖励表
|
||||
[2] = ConfigManager.GetConfig(ConfigName.GodSacrificeConfig),--社稷大典奖励表
|
||||
[3] = ConfigManager.GetConfig(ConfigName.ArenaReward),--竞技场奖励表
|
||||
}
|
||||
|
||||
-- Tab管理器
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local _TabImgData = {select = "r_tongyong_xiaanniu_01", default = "r_tongyong_xiaanniu_02",}
|
||||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) }
|
||||
local _TabData = {
|
||||
[1]= {txt = "日常奖励"},
|
||||
[2]= {txt = "赛季奖励"},
|
||||
}
|
||||
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
function GeneralRankRewardPanel:InitComponent()
|
||||
this.arenaBottom = Util.GetGameObject(self.gameObject, "ArenaBottom")
|
||||
this.tabbox = Util.GetGameObject(self.gameObject, "ArenaBottom/tabbox")
|
||||
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
this.Title = Util.GetGameObject(self.gameObject, "Title"):GetComponent("Text")
|
||||
this.tipText = Util.GetGameObject(self.gameObject, "content1/tipText"):GetComponent("Text")
|
||||
this.myRank = Util.GetGameObject(self.gameObject, "content1/myRank")
|
||||
this.myRankNum = Util.GetGameObject(self.gameObject, "content1/myRank/num"):GetComponent("Text")
|
||||
|
||||
local v2 = Util.GetGameObject(self.gameObject, "content1/scrollRect"):GetComponent("RectTransform").rect
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "content1/scrollRect").transform,
|
||||
Util.GetGameObject(self.gameObject, "content1/itemPre"), nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(10,10))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 1
|
||||
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function GeneralRankRewardPanel:BindEvent()
|
||||
|
||||
this.TabCtrl = TabBox.New()
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
|
||||
this.TabCtrl:Init(this.tabbox, _TabData)
|
||||
|
||||
Util.AddClick(self.btnBack, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
|
||||
-- tab按钮自定义显示设置
|
||||
function this.TabAdapter(tab, index, status)
|
||||
local img = Util.GetGameObject(tab, "Image")
|
||||
local txt = Util.GetGameObject(tab, "Text")
|
||||
img:GetComponent("Image").sprite = Util.LoadSprite(_TabImgData[status])
|
||||
txt:GetComponent("Text").text = _TabData[index].txt
|
||||
txt:GetComponent("Text").color = _TabFontColor[status]
|
||||
end
|
||||
|
||||
-- tab改变回调事件
|
||||
function this.OnTabChange(index)
|
||||
tabNum = index
|
||||
if curRankType == 3 then
|
||||
this.ShowRewardInfo(nil,tabNum)
|
||||
this.RefreshMyInfo(myrank,tabNum)
|
||||
end
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function GeneralRankRewardPanel:AddListener()
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function GeneralRankRewardPanel:RemoveListener()
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function GeneralRankRewardPanel:OnOpen(Type,myRank,ActivityId)
|
||||
curRankType = Type
|
||||
myrank = tonumber(myRank)
|
||||
this.arenaBottom:SetActive(Type == 3)--如果是竞技场的话显示一堆零碎
|
||||
RewardConfig = ConfigList[Type]
|
||||
this.ShowRewardInfo(ActivityId,tabNum)
|
||||
this.SetMyRank()
|
||||
if curRankType == 3 then
|
||||
this.RefreshMyInfo()
|
||||
end
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function GeneralRankRewardPanel:OnShow()
|
||||
end
|
||||
|
||||
function GeneralRankRewardPanel:OnSortingOrderChange()
|
||||
for i, v in pairs(itemList) do
|
||||
for j = 1, #v do
|
||||
v[j]:SetEffectLayer(self.sortingOrder)
|
||||
end
|
||||
end
|
||||
for i, v in pairs(itemList2) do
|
||||
for j = 1, #v do
|
||||
v[j]:SetEffectLayer(self.sortingOrder)
|
||||
end
|
||||
end
|
||||
|
||||
sorting = self.sortingOrder
|
||||
end
|
||||
|
||||
function this.SetMyRank()
|
||||
if myrank and myrank > 0 then
|
||||
this.myRank:SetActive(true)
|
||||
this.myRankNum.text = Language[10104]..myrank
|
||||
else
|
||||
this.myRank:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
--如果是竞技场的话显示下面一堆的东西
|
||||
function this.RefreshMyInfo()
|
||||
local sortNumTabs = {}
|
||||
local rewardList = {}
|
||||
local myInfo = Util.GetGameObject(this.arenaBottom, "myInfo")
|
||||
local norank = Util.GetGameObject(this.arenaBottom, "myInfo/myrank")
|
||||
norank:SetActive(false)
|
||||
for i = 1, 4 do
|
||||
sortNumTabs[i] = Util.GetGameObject(myInfo, "sortNum/sortNum ("..i..")")
|
||||
sortNumTabs[i]:SetActive(false)
|
||||
end
|
||||
if myrank and myrank > 0 then
|
||||
if myrank < 4 then
|
||||
sortNumTabs[myrank]:SetActive(true)
|
||||
else
|
||||
sortNumTabs[4]:SetActive(true)
|
||||
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text = myrank
|
||||
end
|
||||
|
||||
if not itemList2 then
|
||||
itemList2 = {}
|
||||
end
|
||||
for i = 1, #itemList do
|
||||
itemList2[i].gameObject:SetActive(false)
|
||||
end
|
||||
--获取奖励
|
||||
for k,value in ConfigPairs(arenaReward) do
|
||||
if myrank <= 3 then
|
||||
if tabNum == 1 then
|
||||
rewardList = arenaReward[myrank].DailyReward
|
||||
elseif tabNum == 2 then
|
||||
rewardList = arenaReward[myrank].SeasonReward
|
||||
end
|
||||
elseif myrank > 3 then
|
||||
if myrank >= value.MinRank and myrank <= value.MaxRank then
|
||||
if tabNum == 1 then
|
||||
rewardList = value.DailyReward
|
||||
elseif tabNum == 2 then
|
||||
rewardList = value.SeasonReward
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--显示奖励
|
||||
for i = 1, #rewardList do
|
||||
if itemList2[i] then
|
||||
itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting)
|
||||
else
|
||||
itemList2[i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(myInfo, "content").transform)
|
||||
itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting)
|
||||
end
|
||||
itemList2[i].gameObject:SetActive(true)
|
||||
end
|
||||
else
|
||||
norank:SetActive(true)
|
||||
norank:GetComponent("Text").text = Language[10041]
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function this.ShowRewardInfo(ActivityId,tabNum)
|
||||
RewardList = {}
|
||||
if ActivityId then--活动类的排行榜
|
||||
for _, configInfo in ConfigPairs(RewardConfig) do
|
||||
if configInfo.ActivityId == ActivityId then
|
||||
table.insert(RewardList,configInfo)
|
||||
end
|
||||
end
|
||||
|
||||
this.ScrollView:SetData(RewardList, function (index, go)
|
||||
this.ActivityRewardSingleShow(go, RewardList[index],index)
|
||||
end)
|
||||
|
||||
else--非活动类的排行榜(竞技场)
|
||||
for _, configInfo in ConfigPairs(RewardConfig) do
|
||||
table.insert(RewardList,configInfo)
|
||||
end
|
||||
|
||||
this.ScrollView:SetData(RewardList, function (index, go)
|
||||
this.ActivityRewardSingleShow(go, RewardList[index],index,tabNum)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
--一般奖励-单列
|
||||
function this.ActivityRewardSingleShow(activityRewardGo,rewardData,index,tabNum)
|
||||
local sortNumTabs = {}
|
||||
for i = 1, 4 do
|
||||
sortNumTabs[i] = Util.GetGameObject(activityRewardGo, "sortNum/sortNum ("..i..")")
|
||||
sortNumTabs[i]:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
if rewardData.MaxRank == rewardData.MinRank then
|
||||
if rewardData.MinRank < 4 then
|
||||
sortNumTabs[ rewardData.MaxRank]:SetActive(true)
|
||||
else
|
||||
sortNumTabs[4]:SetActive(true)
|
||||
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text = rewardData.MinRank
|
||||
end
|
||||
else
|
||||
sortNumTabs[4]:SetActive(true)
|
||||
if rewardData.MaxRank > 100 then
|
||||
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text =rewardData.MinRank-1 .."+"
|
||||
else
|
||||
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text =rewardData.MinRank .."-".. rewardData.MaxRank
|
||||
end
|
||||
end
|
||||
if not itemList[activityRewardGo.name] then
|
||||
itemList[activityRewardGo.name] = {}
|
||||
end
|
||||
for i = 1, #itemList[activityRewardGo.name] do
|
||||
itemList[activityRewardGo.name][i].gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
--判断是否是竞技场
|
||||
if curRankType == 3 then
|
||||
if tabNum == 1 then
|
||||
for i = 1, #rewardData.DailyReward do
|
||||
if itemList[activityRewardGo.name][i] then
|
||||
itemList[activityRewardGo.name][i]:OnOpen(false, rewardData.DailyReward[i], 0.75,false,false,false,sorting)
|
||||
else
|
||||
itemList[activityRewardGo.name][i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(activityRewardGo, "content").transform)
|
||||
itemList[activityRewardGo.name][i]:OnOpen(false, rewardData.DailyReward[i], 0.75,false,false,false,sorting)
|
||||
end
|
||||
itemList[activityRewardGo.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
elseif tabNum == 2 then
|
||||
for i = 1, #rewardData.SeasonReward do
|
||||
if itemList[activityRewardGo.name][i] then
|
||||
itemList[activityRewardGo.name][i]:OnOpen(false, rewardData.SeasonReward[i], 0.75,false,false,false,sorting)
|
||||
else
|
||||
itemList[activityRewardGo.name][i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(activityRewardGo, "content").transform)
|
||||
itemList[activityRewardGo.name][i]:OnOpen(false, rewardData.SeasonReward[i], 0.75,false,false,false,sorting)
|
||||
end
|
||||
itemList[activityRewardGo.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
else
|
||||
for i = 1, #rewardData.RankingReward do
|
||||
if itemList[activityRewardGo.name][i] then
|
||||
itemList[activityRewardGo.name][i]:OnOpen(false, rewardData.RankingReward[i], 0.75,false,false,false,sorting)
|
||||
else
|
||||
itemList[activityRewardGo.name][i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(activityRewardGo, "content").transform)
|
||||
itemList[activityRewardGo.name][i]:OnOpen(false, rewardData.RankingReward[i], 0.75,false,false,false,sorting)
|
||||
end
|
||||
itemList[activityRewardGo.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function GeneralRankRewardPanel:OnClose()
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function GeneralRankRewardPanel:OnDestroy()
|
||||
itemList = {}
|
||||
itemList2 = {}
|
||||
end
|
||||
|
||||
return GeneralRankRewardPanel
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: bda9ecef7604f7b4287531099fb05bee
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|